diff options
| author | sjaakola <seppo.jaakola@iki.fi> | 2016-02-29 16:36:17 +0200 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-08-21 16:17:01 -0400 |
| commit | b159b666e5191b22618e631e9ed48159be541f7e (patch) | |
| tree | 3de46d247e982ef30a024c5f50b7c7f608987c48 /sql/lock.cc | |
| parent | 4290117b79bccec71b4a92c99beb3e15668627e7 (diff) | |
| download | mariadb-git-b159b666e5191b22618e631e9ed48159be541f7e.tar.gz | |
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
Diffstat (limited to 'sql/lock.cc')
| -rw-r--r-- | sql/lock.cc | 6 |
1 files changed, 1 insertions, 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 */ |