revision-id: 12d09c1a4a8917d345bfd0645d5f6767a4bedcca (mariadb-10.4.1-111-g12d09c1a4a8) parent(s): c3a1cd35554fb9bbd5b2086516678d2b7a7b1e48 author: Jan Lindström committer: Jan Lindström timestamp: 2019-01-25 07:56:57 +0200 message: 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. --- storage/innobase/lock/lock0lock.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/storage/innobase/lock/lock0lock.cc b/storage/innobase/lock/lock0lock.cc index 493f73cc148..a8877ab8a33 100644 --- a/storage/innobase/lock/lock0lock.cc +++ b/storage/innobase/lock/lock0lock.cc @@ -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 @@ -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);