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/rpl_gtid.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/rpl_gtid.cc')
| -rw-r--r-- | sql/rpl_gtid.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/rpl_gtid.cc b/sql/rpl_gtid.cc index 4101c2ff4ea..965af7e9b69 100644 --- a/sql/rpl_gtid.cc +++ b/sql/rpl_gtid.cc @@ -16,11 +16,10 @@ /* Definitions for MariaDB global transaction ID (GTID). */ -#include <my_global.h> +#include "mariadb.h" #include "sql_priv.h" -#include "my_sys.h" #include "unireg.h" -#include "my_global.h" +#include "mariadb.h" #include "sql_base.h" #include "sql_parse.h" #include "key.h" |