Changes for mysql 5.6