Merge pull request #43 from amithkanand/generic_issues

MySQL changes to support Percona 5.6.21