Added first set of MariaDB10 changes and additions