Refs MW-252

sjaakola · Nirbhay Choubey · commit b159b666e519 · 2016-08-21T16:17:01.000-04:00
- Calling FTWRL two times in a row caused desync error, this is fixed
  by making sub-sequent FTWRL calls bail out before wsrep operations
diff --git 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 */
 

Original file line number	Diff line number	Diff line change
`@@ -1120,11 +1120,7 @@ bool Global_read_lock::make_global_read_lock_block_commit(THD *thd)`
`1120`	`1120`	`{`
`1121`	`1121`	`WSREP_DEBUG("GRL was in block commit mode when entering "`
`1122`	`1122`	`"make_global_read_lock_block_commit");`
`1123`		`- thd->mdl_context.release_lock(m_mdl_blocks_commits_lock);`
`1124`		`- m_mdl_blocks_commits_lock= NULL;`
`1125`		`- wsrep_locked_seqno= WSREP_SEQNO_UNDEFINED;`
`1126`		`- wsrep->resume(wsrep);`
`1127`		`- m_state= GRL_ACQUIRED;`
	`1123`	`+ DBUG_RETURN(FALSE);`
`1128`	`1124`	`}`
`1129`	`1125`	`#endif /* WITH_WSREP */`
`1130`	`1126`