more bug fixes
Merge branch 'mysqldb-dev' into bp/db-mysqldb-impl