mysql: lint fixes

Change-Id: Iad6ffec74cb57a7031932b0e790e8d90b1992c80
Merge "mysql: lint fixes" into production