Mysql is okay
Merged changes from upstream
Some changes