From 640fadf2f86778d844835ab31f865545b74e131f Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 10 Nov 2001 22:24:12 -0700 Subject: 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 --- sql/repl_failsafe.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'sql/repl_failsafe.h') diff --git a/sql/repl_failsafe.h b/sql/repl_failsafe.h index b71dde1dc10..77bc03ce8c0 100644 --- a/sql/repl_failsafe.h +++ b/sql/repl_failsafe.h @@ -2,6 +2,8 @@ #define REPL_FAILSAFE_H #include "mysql.h" +#include "my_sys.h" +#include "slave.h" typedef enum {RPL_AUTH_MASTER=0,RPL_ACTIVE_SLAVE,RPL_IDLE_SLAVE, RPL_LOST_SOLDIER,RPL_TROOP_SOLDIER, @@ -19,4 +21,18 @@ pthread_handler_decl(handle_failsafe_rpl,arg); void change_rpl_status(RPL_STATUS from_status, RPL_STATUS to_status); int find_recovery_captain(THD* thd, MYSQL* mysql); int update_slave_list(MYSQL* mysql); + +extern HASH slave_list; + +int load_master_data(THD* thd); +int connect_to_master(THD *thd, MYSQL* mysql, MASTER_INFO* mi); + +int show_new_master(THD* thd); +int show_slave_hosts(THD* thd); +int translate_master(THD* thd, LEX_MASTER_INFO* mi, char* errmsg); +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); + #endif -- cgit v1.2.1