diff options
| author | unknown <sasha@mysql.sashanet.com> | 2001-10-11 13:54:06 -0600 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2001-10-11 13:54:06 -0600 |
| commit | 56303b0383da01a94293927c209a962effd930d0 (patch) | |
| tree | d2e073808531804402cf154ac12d525851282b35 /sql/repl_failsafe.h | |
| parent | 2f4e168159e72028633fe5005dd3e85211fc476e (diff) | |
| download | mariadb-git-56303b0383da01a94293927c209a962effd930d0.tar.gz | |
fixes for mysql-test to run without manager
a bit more work on failsafe replication
client/mysqltest.c:
added require_manager support
mysql-test/mysql-test-run.sh:
added --no-manager
mysql-test/r/rpl_failsafe.result:
updated result
mysql-test/t/rpl000018.test:
must have manager
mysql-test/t/rpl_failsafe.test:
must have manager
sql/repl_failsafe.cc:
more work
sql/repl_failsafe.h:
more work
sql/slave.cc:
update replication status for fail-safe replication on different events
Diffstat (limited to 'sql/repl_failsafe.h')
| -rw-r--r-- | sql/repl_failsafe.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/repl_failsafe.h b/sql/repl_failsafe.h index 95069404acb..42b386e6255 100644 --- a/sql/repl_failsafe.h +++ b/sql/repl_failsafe.h @@ -3,11 +3,14 @@ typedef enum {RPL_AUTH_MASTER=0,RPL_ACTIVE_SLAVE,RPL_IDLE_SLAVE, RPL_LOST_SOLDIER,RPL_TROOP_SOLDIER, - RPL_RECOVERY_CAPTAIN,RPL_NULL} RPL_STATUS; + RPL_RECOVERY_CAPTAIN,RPL_NULL /* inactive */, + RPL_ANY /* wild card used by change_rpl_status */ } RPL_STATUS; 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 const char* rpl_role_type[], *rpl_status_type[]; + +void change_rpl_status(RPL_STATUS from_status, RPL_STATUS to_status); #endif |