wip mariadb merged.