Specify mysql engine on creation

I merged #8242 so it can be applied cleanly

I didn't squash because I don't want @kenmazaika 's contribution to be lost, and he does not seem to want to merge this himself.

Thanks