summaryrefslogtreecommitdiff
path: root/sql/wsrep_mysqld.cc
diff options
context:
space:
mode:
authorsjaakola <seppo.jaakola@iki.fi>2015-04-28 20:38:25 +0300
committerNirbhay Choubey <nirbhay@mariadb.com>2015-09-09 21:31:16 -0400
commit63c5bee535f0827721484c93a2ba8798437fadf5 (patch)
tree7a1ba13a833c784532372e2adcfc8c95530fe132 /sql/wsrep_mysqld.cc
parent417f778e53f6d3c111ef25976d7f1b2d532ca2a3 (diff)
downloadmariadb-git-63c5bee535f0827721484c93a2ba8798437fadf5.tar.gz
Refs codership/mysql-wsrep#113 - Extended the protection of local FLUSH
sessions to cover all exclusive MDL locks
Diffstat (limited to 'sql/wsrep_mysqld.cc')
-rw-r--r--sql/wsrep_mysqld.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/wsrep_mysqld.cc b/sql/wsrep_mysqld.cc
index 1e46d577875..20ba2d7a51a 100644
--- a/sql/wsrep_mysqld.cc
+++ b/sql/wsrep_mysqld.cc
@@ -1500,7 +1500,7 @@ wsrep_grant_mdl_exception(MDL_context *requestor_ctx,
ret = TRUE;
}
else if (granted_thd->lex->sql_command == SQLCOM_FLUSH ||
- granted_thd->wsrep_exec_mode == LOCAL_FLUSH)
+ granted_thd->mdl_context.wsrep_has_explicit_locks())
{
WSREP_DEBUG("BF thread waiting for FLUSH");
ticket->wsrep_report(wsrep_debug);