Changes for MariaDB support

Reynald Bourtembourg requested to merge github/fork/bourtemb/changes_for_mariadb_support into master Dec 14, 2016