diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2014-02-05 00:28:11 -0500 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2014-02-05 00:28:11 -0500 |
| commit | 4cb029b38b914751926c472a3a944fc0e84533be (patch) | |
| tree | 576161865bb4128ef898a823db9ecb6ca30fba62 /sql/sql_parse.cc | |
| parent | 7ca53d947959fe420c28400c621f427b3008fe19 (diff) | |
| download | mariadb-git-4cb029b38b914751926c472a3a944fc0e84533be.tar.gz | |
* Merged the missing revision 3934 from
codership-mysql/5.5 (missed in the last merge).
* Merged changes from Innodb to xtradb.
* Updated WSREP_PATCH_REVNO
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 45581e6a9c3..52de2659a9f 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -7254,7 +7254,7 @@ uint kill_one_thread(THD *thd, ulong id, killed_state kill_signal) #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)) + !wsrep_thd_is_BF((void *)tmp, true)) #else if ((thd->security_ctx->master_access & SUPER_ACL) || thd->security_ctx->user_matches(tmp->security_ctx)) |