#8 rebase changes to mysql-5.5.34