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/log.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/log.cc')
| -rw-r--r-- | sql/log.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/log.cc b/sql/log.cc index 166180e08a4..97982eed7fa 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -25,7 +25,7 @@ Abort logging when we get an error in reading or writing log files */ -#include <my_global.h> /* NO_EMBEDDED_ACCESS_CHECKS */ +#include "mariadb.h" /* NO_EMBEDDED_ACCESS_CHECKS */ #include "sql_priv.h" #include "log.h" #include "sql_base.h" // open_log_table @@ -5870,6 +5870,8 @@ MYSQL_BIN_LOG::write_gtid_event(THD *thd, bool standalone, local_server_id= thd->variables.server_id; seq_no= thd->variables.gtid_seq_no; + DBUG_ASSERT(local_server_id != 0); + if (thd->variables.option_bits & OPTION_GTID_BEGIN) { DBUG_PRINT("error", ("OPTION_GTID_BEGIN is set. " |