diff options
| author | Seppo Jaakola <seppo.jaakola@codership.com> | 2013-05-27 23:03:08 +0300 |
|---|---|---|
| committer | Seppo Jaakola <seppo.jaakola@codership.com> | 2013-05-27 23:03:08 +0300 |
| commit | f37231cf46a8586c96462bee63ae3726961d7f1c (patch) | |
| tree | d7dd1bb563da11f3b9dc48d87dfa04ddac7c5736 /sql/sql_parse.cc | |
| parent | 24fd60895bb57918247f7e01d977223207a95319 (diff) | |
| download | mariadb-git-f37231cf46a8586c96462bee63ae3726961d7f1c.tar.gz | |
References: MDEV-3924 lp:1088267 - merged fix from lp:codership-mysql
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 6 |
1 files changed, 6 insertions, 0 deletions
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; |