MySQL changes to support Percona 5.6.21
Fixed hive issues to make it stable