From: Chris Hofstaedtler <chris.hofstaedtler@deduktiva.com>
Date: Fri, 10 Aug 2018 12:46:05 +0000 (+0200)
Subject: Workaround MariaDB pretending to be MySQL
X-Git-Tag: dnsdist-1.3.3~165^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F6844%2Fhead;p=thirdparty%2Fpdns.git

Workaround MariaDB pretending to be MySQL
---

diff --git a/modules/gmysqlbackend/smysql.cc b/modules/gmysqlbackend/smysql.cc
index cd0fc8cb85..67ccac095b 100644
--- a/modules/gmysqlbackend/smysql.cc
+++ b/modules/gmysqlbackend/smysql.cc
@@ -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