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/sql_cache.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/sql_cache.cc')
-rw-r--r-- | sql/sql_cache.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc index 96a64697390..41c3ee33cfd 100644 --- a/sql/sql_cache.cc +++ b/sql/sql_cache.cc @@ -328,7 +328,7 @@ TODO list: (This could be done with almost no speed penalty) */ -#include <my_global.h> /* NO_EMBEDDED_ACCESS_CHECKS */ +#include "mariadb.h" /* NO_EMBEDDED_ACCESS_CHECKS */ #include "sql_priv.h" #include "sql_basic_types.h" #include "sql_cache.h" |