merge orignal version of SE to mysql 5.5