fix mysql bug
merge