Bug #3828 MariaDB reported as MySQL
Fix merge conflict