mirror of
https://github.com/MariaDB/server.git
synced 2026-04-19 23:05:32 +02:00
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 sql/slave.cc: fd -> vio sql/sql_class.cc: fd->vio, fixed coredump on set @a := foo; sql/sql_class.h: fd -> vio sql/sql_repl.cc: fd -> vio sql/sql_yacc.yy: added support for kill expr - needed this for a clean test case of kill
This commit is contained in:
parent
8046201101
commit
5e90d39db9
9 changed files with 98 additions and 57 deletions
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue