diff options
Diffstat (limited to 'sql/sql_repl.h')
| -rw-r--r-- | sql/sql_repl.h | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/sql/sql_repl.h b/sql/sql_repl.h index c12e0536058..4b9f741dde7 100644 --- a/sql/sql_repl.h +++ b/sql/sql_repl.h @@ -15,7 +15,6 @@ typedef struct st_slave_info } SLAVE_INFO; extern bool opt_show_slave_auth_info, opt_old_rpl_compat; -extern HASH slave_list; extern char* master_host; extern my_string opt_bin_logname, master_info_file; extern uint32 server_id; @@ -27,26 +26,24 @@ extern int max_binlog_dump_events; extern bool opt_sporadic_binlog_dump_fail; #endif +#ifdef SIGNAL_WITH_VIO_CLOSE +#define KICK_SLAVE { slave_thd->close_active_vio(); \ + thr_alarm_kill(slave_real_id); } +#else +#define KICK_SLAVE thr_alarm_kill(slave_real_id); +#endif + File open_binlog(IO_CACHE *log, const char *log_file_name, const char **errmsg); int start_slave(THD* thd = 0, bool net_report = 1); int stop_slave(THD* thd = 0, bool net_report = 1); -int load_master_data(THD* thd); -int connect_to_master(THD *thd, MYSQL* mysql, MASTER_INFO* mi); int change_master(THD* thd); -int show_new_master(THD* thd); -int show_slave_hosts(THD* thd); int show_binlog_events(THD* thd); -int translate_master(THD* thd, LEX_MASTER_INFO* mi, char* errmsg); int cmp_master_pos(const char* log_file_name1, ulonglong log_pos1, const char* log_file_name2, ulonglong log_pos2); void reset_slave(); void reset_master(); -void init_slave_list(); -void end_slave_list(); -int register_slave(THD* thd, uchar* packet, uint packet_length); -void unregister_slave(THD* thd, bool only_mine, bool need_mutex); int purge_master_logs(THD* thd, const char* to_log); bool log_in_use(const char* log_name); void adjust_linfo_offsets(my_off_t purge_offset); |