From f37231cf46a8586c96462bee63ae3726961d7f1c Mon Sep 17 00:00:00 2001
From: Seppo Jaakola <seppo.jaakola@codership.com>
Date: Mon, 27 May 2013 23:03:08 +0300
Subject: [PATCH] References: MDEV-3924 lp:1088267 - merged fix from
 lp:codership-mysql

---
 sql/sql_parse.cc | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 0765138c1c9..c8be6be541f 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -7205,8 +7205,14 @@ uint kill_one_thread(THD *thd, ulong id, killed_state kill_signal)
       faster and do a harder kill than KILL_SYSTEM_THREAD;
     */
 
+#ifdef WITH_WSREP
+    if (((thd->security_ctx->master_access & SUPER_ACL) ||
+        thd->security_ctx->user_matches(tmp->security_ctx)) &&
+	!wsrep_thd_is_brute_force((void *)tmp))
+#else
     if ((thd->security_ctx->master_access & SUPER_ACL) ||
         thd->security_ctx->user_matches(tmp->security_ctx))
+#endif /* WITH_WSREP */
     {
       tmp->awake(kill_signal);
       error=0;