diff options
| author | mkaruza <mario.karuza@galeracluster.com> | 2020-02-24 17:04:43 +0100 |
|---|---|---|
| committer | mkaruza <mario.karuza@galeracluster.com> | 2020-03-03 10:29:45 +0100 |
| commit | d87c16be7975ba3a76f811fae2ecf4fd091b4136 (patch) | |
| tree | 091d2acbaf8d7c10616c156a2f14151200fbf5bf /storage/innobase/trx/trx0roll.cc | |
| parent | e637355156cb28388a291b0e3a5e9ee863b2854d (diff) | |
| download | mariadb-git-d87c16be7975ba3a76f811fae2ecf4fd091b4136.tar.gz | |
MDEV-20616: MariaDB-Galera 10.4.8 | Transaction aborted | Sig 6 Shutdown
When connections go to same node and deadlock happens, BF abort should
not happen for victim thread. Fixed by guarding
`wsrep_handle_SR_rollback()` so that is called only for SR transactions.
Co-authored-by: Seppo Jaakola <seppo.jaakola@iki.fi>
Co-authored-by: Daniele Sciascia <daniele.sciascia@galeracluster.com>
Diffstat (limited to 'storage/innobase/trx/trx0roll.cc')
| -rw-r--r-- | storage/innobase/trx/trx0roll.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/innobase/trx/trx0roll.cc b/storage/innobase/trx/trx0roll.cc index b81b1ab3dee..73ac60c635e 100644 --- a/storage/innobase/trx/trx0roll.cc +++ b/storage/innobase/trx/trx0roll.cc @@ -178,7 +178,8 @@ trx_rollback_to_savepoint( complete rollback */ { #ifdef WITH_WSREP - if (savept == NULL && wsrep_on(trx->mysql_thd)) { + if (savept == NULL && wsrep_on(trx->mysql_thd) + && wsrep_thd_is_SR(trx->mysql_thd)) { wsrep_handle_SR_rollback(NULL, trx->mysql_thd); } #endif /* WITH_WSREP */ |