From 4aaa38d26ed95127b8424100c8a14c77af15fc11 Mon Sep 17 00:00:00 2001
From: Michael Widenius <monty@mariadb.org>
Date: Sun, 18 Jun 2017 06:42:16 +0300
Subject: Enusure that my_global.h is included first

- Added sql/mariadb.h file that should be included first by files in sql
  directory, if sql_plugin.h is not used (sql_plugin.h adds SHOW variables
  that must be done before my_global.h is included)
- Removed a lot of include my_global.h from include files
- Removed include's of some files that my_global.h automatically includes
- Removed duplicated include's of my_sys.h
- Replaced include my_config.h with my_global.h
---
 sql/gcalc_slicescan.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sql/gcalc_slicescan.cc')

diff --git a/sql/gcalc_slicescan.cc b/sql/gcalc_slicescan.cc
index ab48542add6..da70daea4a8 100644
--- a/sql/gcalc_slicescan.cc
+++ b/sql/gcalc_slicescan.cc
@@ -15,7 +15,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */
 
 
-#include <my_global.h>
+#include "mariadb.h"
 #include <my_sys.h>
 #include <m_string.h>
 
-- 
cgit v1.2.1