merge mysql.init changes from master

fixes (at least) mysql datadir not being recognized