From 7906a5d37203a8c3c4fb130d482442c3ba151e3b Mon Sep 17 00:00:00 2001
From: Chris Hofstaedtler <chris.hofstaedtler@deduktiva.com>
Date: Fri, 10 Aug 2018 14:46:05 +0200
Subject: [PATCH] Workaround MariaDB pretending to be MySQL

---
 modules/gmysqlbackend/smysql.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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
 
-- 
2.47.2