summaryrefslogtreecommitdiff
path: root/sql/sql_repl.cc
diff options
context:
space:
mode:
authorsasha@mysql.sashanet.com <>2001-03-13 23:07:12 -0700
committersasha@mysql.sashanet.com <>2001-03-13 23:07:12 -0700
commit0dd0d88e8f7d5ad801ece1465962f112bfaf1d5c (patch)
treef48a65896e8f1e426f08cceb93c8c38055216860 /sql/sql_repl.cc
parent555430819d7a35d32691fd74d8005f666ae1907c (diff)
downloadmariadb-git-0dd0d88e8f7d5ad801ece1465962f112bfaf1d5c.tar.gz
changed signal by fd close to signal by vio_close
added support for kill expr fixed coredump in set @a := foo; added testcase for user_var added testcase for kill
Diffstat (limited to 'sql/sql_repl.cc')
-rw-r--r--sql/sql_repl.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc
index 7922ad0eb6a..05e64670df5 100644
--- a/sql/sql_repl.cc
+++ b/sql/sql_repl.cc
@@ -572,8 +572,8 @@ 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();
+#ifdef SIGNAL_WITH_VIO_CLOSE
+ slave_thd->close_active_vio();
#endif
// do not abort the slave in the middle of a query, so we do not set
// thd->killed for the slave thread