MySQL 5.6 fixes