reordered code to ensure that initial setup is done prior to server startup which is done prior to user creation
Merge branch 'master' of https://github.com/dansteen/mysql