Skip to content

Commit 1e6e9fc

Browse files
committed
Fix for MW-286 test
This patch will fix BF aborting of native threads, e.g. threads which have declared wsrep_on=OFF. Earlier, we have used, for innodb trx locks, was_chosen_as_deadlock_victim flag, for marking inodb transactions, which are victims for wsrep BF abort. With native threads (wsrep_on==OFF), re-using was_chosen_as_deadlock_victim flag may lead to inteference with real deadlock, and to deal with this, the patch has added new flag for marking wsrep BF aborts only: was_chosen_as_wsrep_victim
1 parent 536cdbf commit 1e6e9fc

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

storage/innobase/include/trx0trx.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -579,8 +579,8 @@ struct trx_lock_t {
579579
serving the running transaction. */
580580
#ifdef WITH_WSREP
581581
bool was_chosen_as_wsrep_victim;
582-
/*!< high priority wsrep thread has
583-
marked this trx to abort */
582+
/*!< high priority wsrep thread has marked
583+
this trx to abort */
584584
#endif /* WITH_WSREP */
585585

586586
/** Pre-allocated record locks */

0 commit comments

Comments
 (0)