diff options
Diffstat (limited to 'sql/sql_repl.h')
| -rw-r--r-- | sql/sql_repl.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/sql/sql_repl.h b/sql/sql_repl.h index 1fbc6eb30cf..cf5201f17b1 100644 --- a/sql/sql_repl.h +++ b/sql/sql_repl.h @@ -13,6 +13,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include "rpl_filter.h" + #ifdef HAVE_REPLICATION #include "slave.h" @@ -30,7 +32,6 @@ typedef struct st_slave_info extern my_bool opt_show_slave_auth_info; extern char *master_host, *master_info_file; extern bool server_id_supplied; -extern I_List<i_string> binlog_do_db, binlog_ignore_db; extern int max_binlog_dump_events; extern my_bool opt_sporadic_binlog_dump_fail; @@ -41,20 +42,20 @@ extern my_bool opt_sporadic_binlog_dump_fail; pthread_mutex_unlock(&(thd)->LOCK_delete); \ } while(0) -int start_slave(THD* thd, MASTER_INFO* mi, bool net_report); -int stop_slave(THD* thd, MASTER_INFO* mi, bool net_report); -bool change_master(THD* thd, MASTER_INFO* mi); +int start_slave(THD* thd, Master_info* mi, bool net_report); +int stop_slave(THD* thd, Master_info* mi, bool net_report); +bool change_master(THD* thd, Master_info* mi); bool mysql_show_binlog_events(THD* thd); int cmp_master_pos(const char* log_file_name1, ulonglong log_pos1, const char* log_file_name2, ulonglong log_pos2); -int reset_slave(THD *thd, MASTER_INFO* mi); +int reset_slave(THD *thd, Master_info* mi); int reset_master(THD* thd); bool purge_master_logs(THD* thd, const char* to_log); bool purge_master_logs_before_date(THD* thd, time_t purge_time); bool log_in_use(const char* log_name); void adjust_linfo_offsets(my_off_t purge_offset); bool show_binlogs(THD* thd); -extern int init_master_info(MASTER_INFO* mi); +extern int init_master_info(Master_info* mi); void kill_zombie_dump_threads(uint32 slave_server_id); int check_binlog_magic(IO_CACHE* log, const char** errmsg); @@ -66,6 +67,7 @@ typedef struct st_load_file_info } LOAD_FILE_INFO; int log_loaded_block(IO_CACHE* file); +int init_replication_sys_vars(); #endif /* HAVE_REPLICATION */ |