update path to my.cnf file for new version of mysql
Merge remote branch 'origin/master'