diff options
| author | unknown <sasha@mysql.sashanet.com> | 2001-03-12 20:17:32 -0700 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2001-03-12 20:17:32 -0700 |
| commit | f87b3ee44deb4221b525a16a376e2e1f77d964d9 (patch) | |
| tree | 479dd490b5d379c89c00078b36cfb7a02d867866 /sql/sql_repl.cc | |
| parent | 76d77185fe6d4a2d66aed021e3aa42643e6a63a9 (diff) | |
| download | mariadb-git-f87b3ee44deb4221b525a16a376e2e1f77d964d9.tar.gz | |
untested changes to close socket on slave stop for OS's that do not
interrupt I/O after thr_alarm_kill()
test case for order by desc coredump
mysql-test/t/order_by.test:
added test case for order by desc bug
sql/slave.cc:
close socket on slave stop
sql/slave.h:
close socket on slave stop
sql/sql_class.cc:
close socket on slave stop
sql/sql_class.h:
close socket on slave stop
sql/sql_parse.cc:
changed kill_one_thread to use prepare_to_die()
sql/sql_repl.cc:
close socket on slave stop
Diffstat (limited to 'sql/sql_repl.cc')
| -rw-r--r-- | sql/sql_repl.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index e354bb65713..7922ad0eb6a 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -572,6 +572,9 @@ int stop_slave(THD* thd, bool net_report ) { abort_slave = 1; thr_alarm_kill(slave_real_id); +#ifdef STOP_IO_WITH_FD_CLOSE + slave_thd->close_active_fd(); +#endif // do not abort the slave in the middle of a query, so we do not set // thd->killed for the slave thread thd->proc_info = "waiting for slave to die"; |