#2 fixes for mysql
#2 mysql handling