updated test to read mysql option from ~/.my.cnf
Merge branch 'dev' into merger