diff options
author | unknown <sven@riska.(none)> | 2008-03-11 14:42:54 +0100 |
---|---|---|
committer | unknown <sven@riska.(none)> | 2008-03-11 14:42:54 +0100 |
commit | 1836625fb4e42b1629b59a4f070d6849da2ee434 (patch) | |
tree | eb75e4674ea17a34c26f2564b59db9d5f3bde5f5 /sql/share | |
parent | 0e679ab782e6968b159bcca8cdf307e5602dd3ea (diff) | |
download | mariadb-git-1836625fb4e42b1629b59a4f070d6849da2ee434.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.
sql/slave.cc:
Send a SIGALRM signal to the slave thread when stopping it (using
pthread_kill()). This breaks current socket(), connect(), poll() etc.
calls, and makes the subsequent thd->awake() call effective.
Also, move the definition of KICK_SLAVE to slave.cc.
sql/sql_repl.h:
Removed KICK_SLAVE and inlined it in slave.cc because:
- it was only called once, so better to make it local to where it is used
- it needed to include a preprocessor conditional in the middle
Diffstat (limited to 'sql/share')
0 files changed, 0 insertions, 0 deletions