Minor code reformat.
Halfway through mysql downgrade
Wrap in flag.
Merge pull request #8029 from cachedout/mysql_grant_downgrade

Mysql grant downgrade