diff options
author | unknown <sasha@mysql.sashanet.com> | 2001-10-23 13:28:03 -0600 |
---|---|---|
committer | unknown <sasha@mysql.sashanet.com> | 2001-10-23 13:28:03 -0600 |
commit | 8fc78e08b0e68f82121b0bba8d930bc5ec57a29f (patch) | |
tree | c5c654aca3970830687c68cb22289835e1719233 /sql/repl_failsafe.h | |
parent | 74f49f9f34b7a4cc1b87aa1cb657b72f8c6c856e (diff) | |
download | mariadb-git-8fc78e08b0e68f82121b0bba8d930bc5ec57a29f.tar.gz |
cleanup
removal of duplicate code in mf_iocache.cc
work on failsafe replication
work on SEQ_READ_APPEND io cache
include/my_sys.h:
updates for SEQ_READ_APPEND
libmysql/Makefile.am:
fix for mysys/mf_iocache.c
libmysql/libmysql.c:
updates for new format of SHOW SLAVE HOSTS
mysql-test/r/rpl000001.result:
test replication of LOAD DATA LOCAL INFILE
mysql-test/r/rpl000002.result:
updated test result
mysql-test/t/rpl000001.test:
test LOAD DATA LOCAL INFILE
mysys/mf_iocache.c:
cleanup to remove duplicate functionality
some work on SEQ_READ_APPEND
sql/mf_iocache.cc:
cleanup to remove duplicate functionality
sql/repl_failsafe.cc:
more work on failsafe replication
sql/repl_failsafe.h:
more work on failsafe replication
sql/slave.cc:
cleanup
more work on failsafe replication
sql/sql_load.cc:
fixed bug on replicating empty file loads
got LOAD DATA LOCAL INFILE to work again, and to be replicated
sql/sql_repl.cc:
cleanup
more work on failsafe replication
sql/sql_repl.h:
more work on failsafe replication
Diffstat (limited to 'sql/repl_failsafe.h')
-rw-r--r-- | sql/repl_failsafe.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/repl_failsafe.h b/sql/repl_failsafe.h index 42b386e6255..b71dde1dc10 100644 --- a/sql/repl_failsafe.h +++ b/sql/repl_failsafe.h @@ -1,6 +1,8 @@ #ifndef REPL_FAILSAFE_H #define REPL_FAILSAFE_H +#include "mysql.h" + typedef enum {RPL_AUTH_MASTER=0,RPL_ACTIVE_SLAVE,RPL_IDLE_SLAVE, RPL_LOST_SOLDIER,RPL_TROOP_SOLDIER, RPL_RECOVERY_CAPTAIN,RPL_NULL /* inactive */, @@ -10,7 +12,11 @@ extern RPL_STATUS rpl_status; extern pthread_mutex_t LOCK_rpl_status; extern pthread_cond_t COND_rpl_status; extern TYPELIB rpl_role_typelib, rpl_status_typelib; +extern uint rpl_recovery_rank; extern const char* rpl_role_type[], *rpl_status_type[]; +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); #endif |