Fix MySQL creation commands.

Fixes #5426
Merge branch 'master' into next