diff options
| author | Mats Kindahl <mats@sun.com> | 2010-03-31 16:05:33 +0200 |
|---|---|---|
| committer | Mats Kindahl <mats@sun.com> | 2010-03-31 16:05:33 +0200 |
| commit | 23d8586dbfdfdf02fa2f801b9dad91db53025a64 (patch) | |
| tree | 19f32879e77ada23d733f35173a25f410d655ebe /sql/slave.cc | |
| parent | d7dd2fc92f042596c2e72a96934bb207270e7419 (diff) | |
| download | mariadb-git-23d8586dbfdfdf02fa2f801b9dad91db53025a64.tar.gz | |
WL#5030: Split and remove mysql_priv.h
This patch:
- Moves all definitions from the mysql_priv.h file into
header files for the component where the variable is
defined
- Creates header files if the component lacks one
- Eliminates all include directives from mysql_priv.h
- Eliminates all circular include cycles
- Rename time.cc to sql_time.cc
- Rename mysql_priv.h to sql_priv.h
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index b0bb1d5882b..e23763696df 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -24,11 +24,11 @@ replication slave. */ -#include "mysql_priv.h" - -#include <mysql.h> -#include <myisam.h> +#include "sql_priv.h" +#include "my_global.h" #include "slave.h" +#include "sql_parse.h" // execute_init_command +#include "sql_table.h" // mysql_rm_table #include "rpl_mi.h" #include "rpl_rli.h" #include "sql_repl.h" @@ -42,6 +42,15 @@ #include <mysqld_error.h> #include <mysys_err.h> #include "rpl_handler.h" +#include <signal.h> +#include <mysql.h> +#include <myisam.h> + +#include "sql_base.h" // close_thread_tables +#include "tztime.h" // struct Time_zone +#include "log_event.h" // Rotate_log_event, + // Create_file_log_event, + // Format_description_log_event #ifdef HAVE_REPLICATION |