From e703178f04e4f71db1b23016ba7c8e33513dd7f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jaramago=20Fern=C3=A1ndez?=
 <jaramago.fernandez.javier@gmail.com>
Date: Mon, 30 Mar 2020 09:56:24 +0200
Subject: [PATCH] Moved header colliding with <memory> to unique file that
 requires it

---
 include/proxysql.h     | 1 -
 lib/MySQL_Protocol.cpp | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/proxysql.h b/include/proxysql.h
index 71ea156ae..886e59eb2 100644
--- a/include/proxysql.h
+++ b/include/proxysql.h
@@ -51,7 +51,6 @@
 
 #if !defined(__FreeBSD__) && !defined(__APPLE__)
 #define HAVE_BOOL
-#include "ma_global.h"
 //#include "my_pthread.h"
 #endif
 #include "mysql.h"
diff --git a/lib/MySQL_Protocol.cpp b/lib/MySQL_Protocol.cpp
index b66d602cb..7c5880899 100644
--- a/lib/MySQL_Protocol.cpp
+++ b/lib/MySQL_Protocol.cpp
@@ -10,6 +10,8 @@
 
 #include <sstream>
 
+#include <ma_global.h>
+
 extern MySQL_Authentication *GloMyAuth;
 extern MySQL_LDAP_Authentication *GloMyLdapAuth;
 extern MySQL_Threads_Handler *GloMTH;