5.5.33-r31.1 and synced with upstream mysql package

removed a lot of the hacks ase they are all not needed anymore.