Merge changes to the MySQL scripts back into the MariaDB scripts