]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
Workaround MariaDB pretending to be MySQL 6844/head
authorChris Hofstaedtler <chris.hofstaedtler@deduktiva.com>
Fri, 10 Aug 2018 12:46:05 +0000 (14:46 +0200)
committerChris Hofstaedtler <chris.hofstaedtler@deduktiva.com>
Fri, 10 Aug 2018 12:46:05 +0000 (14:46 +0200)
modules/gmysqlbackend/smysql.cc

index cd0fc8cb857c39f2d62a763b5d73b7f3d6ac7627..67ccac095b67ba69dff8fa5b5d90fba6329e5f47 100644 (file)
@@ -32,8 +32,9 @@
 #include "pdns/namespaces.hh"
 #include "pdns/lock.hh"
 
-#if MYSQL_VERSION_ID >= 80000
+#if MYSQL_VERSION_ID >= 80000 && !defined(MARIADB_BASE_VERSION)
 // Need to keep this for compatibility with MySQL < 8.0.0, which used typedef char my_bool;
+// MariaDB up to 10.4 also always define it.
 typedef bool my_bool;
 #endif