Merge "Compatibility with mariadb 10.x and mysql 8.x"