summaryrefslogtreecommitdiff
path: root/sql/sql_parse.cc
diff options
context:
space:
mode:
Diffstat (limited to 'sql/sql_parse.cc')
-rw-r--r--sql/sql_parse.cc14
1 files changed, 3 insertions, 11 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 920f7ac0329..1f060305d4f 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -8292,19 +8292,11 @@ kill_one_thread(THD *thd, longlong id, killed_state kill_signal, killed_type typ
It's ok to also kill DELAYED threads with KILL_CONNECTION instead of
KILL_SYSTEM_THREAD; The difference is that KILL_CONNECTION may be
faster and do a harder kill than KILL_SYSTEM_THREAD;
-
- Note that if thread is wsrep Brute Force or applier thread we
- allow killing it only when we're SUPER.
*/
- if ((thd->security_ctx->master_access & SUPER_ACL) ||
- (thd->security_ctx->user_matches(tmp->security_ctx)
-#ifdef WITH_WSREP
- &&
- !tmp->wsrep_applier &&
- !wsrep_thd_is_BF(tmp, false)
-#endif
- ))
+ if (((thd->security_ctx->master_access & SUPER_ACL) ||
+ thd->security_ctx->user_matches(tmp->security_ctx)) &&
+ !wsrep_thd_is_BF(tmp, false))
{
tmp->awake(kill_signal);
error=0;