From 4aaa38d26ed95127b8424100c8a14c77af15fc11 Mon Sep 17 00:00:00 2001 From: Michael Widenius 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/sql_plugin.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sql/sql_plugin.h') diff --git a/sql/sql_plugin.h b/sql/sql_plugin.h index 469ae5c88a3..f100e8a232a 100644 --- a/sql/sql_plugin.h +++ b/sql/sql_plugin.h @@ -25,7 +25,7 @@ SHOW_LONG_STATUS, SHOW_DOUBLE_STATUS, \ SHOW_HAVE, SHOW_MY_BOOL, SHOW_HA_ROWS, SHOW_SYS, \ SHOW_LONG_NOFLUSH, SHOW_LONGLONG_STATUS, SHOW_LEX_STRING -#include +#include "mariadb.h" #undef SHOW_always_last #include "m_string.h" /* LEX_STRING */ -- cgit v1.2.1