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/gen_lex_hash.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/gen_lex_hash.cc')
-rw-r--r-- | sql/gen_lex_hash.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/gen_lex_hash.cc b/sql/gen_lex_hash.cc index 3a3273d279b..b2bc1aee091 100644 --- a/sql/gen_lex_hash.cc +++ b/sql/gen_lex_hash.cc @@ -78,11 +78,9 @@ So, we can read full search-structure as 32-bit word */ #define NO_YACC_SYMBOLS -#include <my_global.h> +#include "mariadb.h" #include "mysql_version.h" #include "lex.h" -#include <stdlib.h> -#include <stdio.h> #include <string.h> #include <welcome_copyright_notice.h> /* ORACLE_WELCOME_COPYRIGHT_NOTICE */ |