Correct bug in mysql commands.
Merge branch 'master' into oneiric