Fix tests for MySQL 5.6
Fix tests for MySQL 5.5 and MySQL 5.6