Changes needed to support mysql 5.6.