From 21cb1a226064524b2bb0e90babc6071db17bfb2b Mon Sep 17 00:00:00 2001
From: Lemongrass3110 <lemongrass@kstp.at>
Date: Wed, 20 Jun 2018 17:41:10 +0200
Subject: [PATCH] Fixed MariaDB compilation problems

Credits to Sergei Golubchik on https://jira.mariadb.org/browse/MDEV-13773
---
 src/common/sql.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/common/sql.cpp b/src/common/sql.cpp
index e32778ba5c..75debe3302 100644
--- a/src/common/sql.cpp
+++ b/src/common/sql.cpp
@@ -12,12 +12,12 @@
 #include "winapi.hpp"
 #endif
 #include <mysql.h>
-#include <mysql_version.h>
 #include <stdlib.h>// strtoul
 
 // MySQL 8.0 or later removed my_bool typedef.
 // Reintroduce it as a bandaid fix.
-#if MYSQL_VERSION_ID >= 80000
+// See https://bugs.mysql.com/?id=87337
+#if !defined(MARIADB_BASE_VERSION) && !defined(MARIADB_VERSION_ID) && MYSQL_VERSION_ID >= 80001 && MYSQL_VERSION_ID != 80002
 #define my_bool bool
 #endif