MySQL changes to support Percona 5.6.21