diff options
| author | unknown <msvensson@pilot.mysql.com> | 2007-01-29 14:33:53 +0100 |
|---|---|---|
| committer | unknown <msvensson@pilot.mysql.com> | 2007-01-29 14:33:53 +0100 |
| commit | 7620e066dbf16f170ce1a5baa516eb7c560c9a51 (patch) | |
| tree | 5ff0b0c41c572069a02dbb2c6eabec3d10d8900d /sql/repl_failsafe.cc | |
| parent | 39fb7b2423c01b168ca4947307426edb945abfe2 (diff) | |
| parent | a195ad5ea26227dac0d5f503b9e37717b2bc40be (diff) | |
| download | mariadb-git-7620e066dbf16f170ce1a5baa516eb7c560c9a51.tar.gz | |
Merge pilot.mysql.com:/home/msvensson/mysql/bug22943/my41-bug22943
into pilot.mysql.com:/home/msvensson/mysql/bug22943/my50-bug22943
sql/mysqld.cc:
Auto merged
sql/net_serv.cc:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql-common/client.c:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
vio/vio.c:
Auto merged
vio/viossl.c:
Auto merged
sql/mysql_priv.h:
Manual merge
sql/sql_parse.cc:
Manual merge
Diffstat (limited to 'sql/repl_failsafe.cc')
| -rw-r--r-- | sql/repl_failsafe.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sql/repl_failsafe.cc b/sql/repl_failsafe.cc index 2cd733db647..a2e5c3b0894 100644 --- a/sql/repl_failsafe.cc +++ b/sql/repl_failsafe.cc @@ -56,6 +56,7 @@ static Slave_log_event* find_slave_event(IO_CACHE* log, functions like register_slave()) are working. */ +#if NOT_USED static int init_failsafe_rpl_thread(THD* thd) { DBUG_ENTER("init_failsafe_rpl_thread"); @@ -96,7 +97,7 @@ static int init_failsafe_rpl_thread(THD* thd) thd->set_time(); DBUG_RETURN(0); } - +#endif void change_rpl_status(RPL_STATUS from_status, RPL_STATUS to_status) { @@ -570,12 +571,14 @@ err: } +#if NOT_USED int find_recovery_captain(THD* thd, MYSQL* mysql) { return 0; } +#endif - +#if NOT_USED pthread_handler_t handle_failsafe_rpl(void *arg) { DBUG_ENTER("handle_failsafe_rpl"); @@ -623,7 +626,7 @@ err: pthread_exit(0); DBUG_RETURN(0); } - +#endif bool show_slave_hosts(THD* thd) { |