mysql: timeout locks every 30 minutes rather than 1 year

Applying this to master too.