diff options
| author | cmiller@zippy.cornsilk.net <> | 2007-02-13 10:54:04 -0500 |
|---|---|---|
| committer | cmiller@zippy.cornsilk.net <> | 2007-02-13 10:54:04 -0500 |
| commit | 11e8f4873459ed70379c1d1e813fa126f25b40cd (patch) | |
| tree | dd32c329ae576946f3a73dda88aa8e45b367f5c6 /sql/repl_failsafe.cc | |
| parent | da9f2149dea1c20c5dc52d0de5bcd0ff19c99fc1 (diff) | |
| parent | 8dc8e07fcf38365eb268d3ce3edbdf29bde89323 (diff) | |
| download | mariadb-git-11e8f4873459ed70379c1d1e813fa126f25b40cd.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
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) { |