database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

MDEV-6290 Crash in KILL HARD QUERY USER x@y when slave threads are running

Browse Source 
KILL USER should ignore system threads where sctx->user=sctx->host=NULL
This commit is contained in:
Sergei Golubchik
2014-07-23 19:36:15 +02:00
parent 80708da138
commit 4e6e720160
3 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/suite/rpl/r/kill_hard-6290.result Normal file
View File

@ -0,0 +1,4 @@
include/master-slave.inc
[connection master]
kill user test2@nohost;
include/rpl_end.inc

11
mysql-test/suite/rpl/t/kill_hard-6290.test Normal file
View File

@ -0,0 +1,11 @@
#
# MDEV-6290 Crash in KILL HARD QUERY USER x@y when slave threads are running
#
# this test doesn't depend on the binlog format, no need to run it three times
--source include/have_binlog_format_mixed.inc
--source include/master-slave.inc
--connection server_2
kill user test2@nohost;
--source include/rpl_end.inc

2
sql/sql_parse.cc
View File

@ -7365,7 +7365,7 @@ static uint kill_threads_for_user(THD *thd, LEX_USER *user,
I_List_iterator<THD> it(threads); I_List_iterator<THD> it(threads);
while ((tmp=it++)) while ((tmp=it++))
{ {
if (tmp->command == COM_DAEMON) if (!tmp->security_ctx->user)
continue; continue;
/* /*
Check that hostname (if given) and user name matches. Check that hostname (if given) and user name matches.