bug5451: Miscellaneous check ins.
Fix warning.
Merge remote-tracking branch 'origin/develop' into feature/MySQL-5.6