fix build errors for MariaDB 10.0.4. refs #1909