(bug 43847) - mysql 5.5 / ansi sql incompatibility

Change-Id: I514d7d1c64d2d4faf179ae0a275f015cf0718be5
Merge "(bug 43847) - mysql 5.5 / ansi sql incompatibility"