diff options
| author | unknown <tsmith@siva.hindu.god> | 2007-02-08 16:01:13 -0700 |
|---|---|---|
| committer | unknown <tsmith@siva.hindu.god> | 2007-02-08 16:01:13 -0700 |
| commit | 43ada21fe1961da0b0c6a0fcfe2040b13acd1320 (patch) | |
| tree | bf975ad89f04386e0a36ff1163782902a85ed0cf /sql/repl_failsafe.cc | |
| parent | 75d614e053301595a350c7ee610fd3e121ad4399 (diff) | |
| parent | 0554802f3cd52fc0241ca245d6e7d3cfc173a371 (diff) | |
| download | mariadb-git-43ada21fe1961da0b0c6a0fcfe2040b13acd1320.tar.gz | |
Merge siva.hindu.god:/home/tsmith/m/bk/41
into siva.hindu.god:/home/tsmith/m/bk/maint/41
sql/sql_prepare.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 61fd5d9bce4..4c8703226a6 100644 --- a/sql/repl_failsafe.cc +++ b/sql/repl_failsafe.cc @@ -57,6 +57,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"); @@ -99,7 +100,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) { @@ -573,12 +574,14 @@ err: } +#if NOT_USED int find_recovery_captain(THD* thd, MYSQL* mysql) { return 0; } +#endif - +#if NOT_USED pthread_handler_decl(handle_failsafe_rpl,arg) { DBUG_ENTER("handle_failsafe_rpl"); @@ -626,7 +629,7 @@ err: pthread_exit(0); DBUG_RETURN(0); } - +#endif int show_slave_hosts(THD* thd) { |