From b159b666e5191b22618e631e9ed48159be541f7e Mon Sep 17 00:00:00 2001 From: sjaakola Date: Mon, 29 Feb 2016 16:36:17 +0200 Subject: Refs MW-252 - Calling FTWRL two times in a row caused desync error, this is fixed by making sub-sequent FTWRL calls bail out before wsrep operations --- sql/lock.cc | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/sql/lock.cc b/sql/lock.cc index f724606a46d..04529308266 100644 --- a/sql/lock.cc +++ b/sql/lock.cc @@ -1120,11 +1120,7 @@ bool Global_read_lock::make_global_read_lock_block_commit(THD *thd) { WSREP_DEBUG("GRL was in block commit mode when entering " "make_global_read_lock_block_commit"); - thd->mdl_context.release_lock(m_mdl_blocks_commits_lock); - m_mdl_blocks_commits_lock= NULL; - wsrep_locked_seqno= WSREP_SEQNO_UNDEFINED; - wsrep->resume(wsrep); - m_state= GRL_ACQUIRED; + DBUG_RETURN(FALSE); } #endif /* WITH_WSREP */ -- cgit v1.2.1