summaryrefslogtreecommitdiff
path: root/sql/sql_repl.h
diff options
context:
space:
mode:
authorunknown <sasha@mysql.sashanet.com>2001-11-10 22:24:12 -0700
committerunknown <sasha@mysql.sashanet.com>2001-11-10 22:24:12 -0700
commit99c6f2feb91cf196fa7cb407d440b81039e8eac5 (patch)
tree9303005b745dbcfba11b4ee43cd2971c956dc974 /sql/sql_repl.h
parente667649323a8b227d94d1b5efa15cc0fbaf3cb3d (diff)
downloadmariadb-git-99c6f2feb91cf196fa7cb407d440b81039e8eac5.tar.gz
work to enable reading 3.23 logs - not yet finished
moved fail-safe replication routines from sql_repl.cc to repl_failsafe.cc write start event only in the first log client/mysqlbinlog.cc: work to enable reading 3.23 logs libmysql/Makefile.shared: added mf_iocache2 to libmysqlclient - needed for mysqlbinlog mysql-test/mysql-test-run.sh: added --start-and-exit mysql-test/r/rpl000002.result: result clean-up mysql-test/r/rpl000016.result: result update mysql-test/r/rpl_log.result: result update mysql-test/t/rpl000016.test: test cleanup mysys/mf_iocache.c: fixed new bug sql/log.cc: write start event only on server start or after reset master sql/log_event.cc: work to enable reading 3.23 log format sql/log_event.h: work to enable reading 3.23 format sql/repl_failsafe.cc: code restructuring sql/repl_failsafe.h: re-organized code sql/slave.cc: check master version sql/slave.h: old_format member sql/sql_class.h: allow user to specify io cache type need_start_event member to allow writing start event only in the first log sql/sql_parse.cc: code re-organization sql/sql_repl.cc: code reorganization sql/sql_repl.h: reorganized code
Diffstat (limited to 'sql/sql_repl.h')
-rw-r--r--sql/sql_repl.h17
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);