diff options
author | Michael Widenius <monty@mariadb.org> | 2017-06-18 06:42:16 +0300 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2017-08-24 01:05:44 +0200 |
commit | 4aaa38d26ed95127b8424100c8a14c77af15fc11 (patch) | |
tree | fd96b83db1e58971f25b7a27239b07cdca0f0793 /sql/set_var.cc | |
parent | b0da8897b08b0717ccae418f880b5ab0f5960312 (diff) | |
download | mariadb-git-4aaa38d26ed95127b8424100c8a14c77af15fc11.tar.gz |
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
Diffstat (limited to 'sql/set_var.cc')
-rw-r--r-- | sql/set_var.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index 5f3aff29913..474bfe683a6 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -16,7 +16,7 @@ /* variable declarations are in sys_vars.cc now !!! */ -#include "sql_plugin.h" // Includes my_global.h +#include "sql_plugin.h" #include "sql_class.h" // set_var.h: session_var_ptr #include "set_var.h" #include "sql_priv.h" |