diff options
| author | sasha@mysql.sashanet.com <> | 2001-03-12 20:17:32 -0700 |
|---|---|---|
| committer | sasha@mysql.sashanet.com <> | 2001-03-12 20:17:32 -0700 |
| commit | a2b6410965d149cb94f8e786acdf0ea15b67d7e0 (patch) | |
| tree | 479dd490b5d379c89c00078b36cfb7a02d867866 /sql/sql_repl.cc | |
| parent | ad8f2810f6fce6f32a732d90736f887fc430d5a0 (diff) | |
| download | mariadb-git-a2b6410965d149cb94f8e786acdf0ea15b67d7e0.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
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"; |