Changes to support MySQL 5.6
MySQL 5.6 migration