Skip to content

Commit

Permalink
MDEV-18369: Crash at wsrep_handle_SR_rollback(THD*, THD*): Assertion …
Browse files Browse the repository at this point in the history
…`victim_thd' failed.

Call to wsrep_handle_SR_rollback was missing check that wsrep_on is true.
  • Loading branch information
Jan Lindström committed Jan 25, 2019
1 parent 78829a5 commit 2d60e32
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions storage/innobase/lock/lock0lock.cc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*****************************************************************************
Copyright (c) 1996, 2017, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2014, 2018, MariaDB Corporation.
Copyright (c) 2014, 2019, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
Expand Down Expand Up @@ -6995,7 +6995,9 @@ DeadlockChecker::trx_rollback()

print("*** WE ROLL BACK TRANSACTION (1)\n");
#ifdef WITH_WSREP
wsrep_handle_SR_rollback(m_start->mysql_thd, trx->mysql_thd);
if (wsrep_on(trx->mysql_thd)) {
wsrep_handle_SR_rollback(m_start->mysql_thd, trx->mysql_thd);
}
#endif

trx_mutex_enter(trx);
Expand Down

0 comments on commit 2d60e32

Please sign in to comment.