Skip to content

Commit 2d60e32

Browse files
author
Jan Lindström
committed
MDEV-18369: Crash at wsrep_handle_SR_rollback(THD*, THD*): Assertion `victim_thd' failed.
Call to wsrep_handle_SR_rollback was missing check that wsrep_on is true.
1 parent 78829a5 commit 2d60e32

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

storage/innobase/lock/lock0lock.cc

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*****************************************************************************
22
33
Copyright (c) 1996, 2017, Oracle and/or its affiliates. All Rights Reserved.
4-
Copyright (c) 2014, 2018, MariaDB Corporation.
4+
Copyright (c) 2014, 2019, MariaDB Corporation.
55
66
This program is free software; you can redistribute it and/or modify it under
77
the terms of the GNU General Public License as published by the Free Software
@@ -6995,7 +6995,9 @@ DeadlockChecker::trx_rollback()
69956995

69966996
print("*** WE ROLL BACK TRANSACTION (1)\n");
69976997
#ifdef WITH_WSREP
6998-
wsrep_handle_SR_rollback(m_start->mysql_thd, trx->mysql_thd);
6998+
if (wsrep_on(trx->mysql_thd)) {
6999+
wsrep_handle_SR_rollback(m_start->mysql_thd, trx->mysql_thd);
7000+
}
69997001
#endif
70007002

70017003
trx_mutex_enter(trx);

0 commit comments

Comments
 (0)