diff options
| author | sven@riska.(none) <> | 2008-03-11 14:42:54 +0100 |
|---|---|---|
| committer | sven@riska.(none) <> | 2008-03-11 14:42:54 +0100 |
| commit | 1322371fb21d6efb85181e2518d1a6cf198bd95d (patch) | |
| tree | eb75e4674ea17a34c26f2564b59db9d5f3bde5f5 /sql/sql_repl.h | |
| parent | 8a4c6521995237d8baba402442ec02124b88a06d (diff) | |
| download | mariadb-git-1322371fb21d6efb85181e2518d1a6cf198bd95d.tar.gz | |
BUG#31024: STOP SLAVE does not stop attempted connect()s
Problem: if the IO slave thread is attempting to connect,
STOP SLAVE waits for the attempt to finish.
It may take a long time.
Fix: don't wait, stop the slave immediately.
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 1fbc6eb30cf..cf400218cc2 100644 --- a/sql/sql_repl.h +++ b/sql/sql_repl.h @@ -35,12 +35,6 @@ extern I_List<i_string> binlog_do_db, binlog_ignore_db; 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); |