diff options
| author | unknown <mkindahl@dl145h.mysql.com> | 2008-03-14 18:38:54 +0100 |
|---|---|---|
| committer | unknown <mkindahl@dl145h.mysql.com> | 2008-03-14 18:38:54 +0100 |
| commit | 92a09cf98b8f8abc6c1f1adc987c9826b657f812 (patch) | |
| tree | d7ebe78e0d2c4fe12e3d1f97c09fd96acfd36b8b /sql/sql_repl.h | |
| parent | 774d21cf3bcdf40ed3c2c33662766922cbbbb569 (diff) | |
| parent | 4097ee7ffa2f8eea143977a2238b016a1c99b3ca (diff) | |
| download | mariadb-git-92a09cf98b8f8abc6c1f1adc987c9826b657f812.tar.gz | |
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
sql/slave.cc:
Auto merged
sql/sql_repl.h:
Auto merged
Diffstat (limited to 'sql/sql_repl.h')
| -rw-r--r-- | sql/sql_repl.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/sql/sql_repl.h b/sql/sql_repl.h index cf5201f17b1..d5c9040f8dc 100644 --- a/sql/sql_repl.h +++ b/sql/sql_repl.h @@ -36,12 +36,6 @@ extern bool server_id_supplied; extern int max_binlog_dump_events; extern my_bool opt_sporadic_binlog_dump_fail; -#define KICK_SLAVE(thd) do { \ - pthread_mutex_lock(&(thd)->LOCK_delete); \ - (thd)->awake(THD::NOT_KILLED); \ - pthread_mutex_unlock(&(thd)->LOCK_delete); \ - } while(0) - int start_slave(THD* thd, Master_info* mi, bool net_report); int stop_slave(THD* thd, Master_info* mi, bool net_report); bool change_master(THD* thd, Master_info* mi); |