WIP: changes to further fixup mysql_database and mysql_user.