diff options
| author | Julius Goryavsky <julius.goryavsky@mariadb.com> | 2020-07-16 13:03:29 +0200 |
|---|---|---|
| committer | Julius Goryavsky <julius.goryavsky@mariadb.com> | 2020-07-16 13:03:29 +0200 |
| commit | 956f21c3b0beba89835e8d24fde4b67b589ab142 (patch) | |
| tree | 6dda80b8519606c47b75f37d2a2d9e496bd0b3a5 /storage/innobase/handler/ha_innodb.cc | |
| parent | 3280edda8968a899f8f2b891059c4cfaff391c9b (diff) | |
| parent | 6a1713ac17a882e0d5a44fa68edd47c064220975 (diff) | |
| download | mariadb-git-956f21c3b0beba89835e8d24fde4b67b589ab142.tar.gz | |
Merge remote-tracking branch 'origin/bb-10.4-MDEV-21910' into 10.4
Diffstat (limited to 'storage/innobase/handler/ha_innodb.cc')
| -rw-r--r-- | storage/innobase/handler/ha_innodb.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index 6056a863f8b..f85ee3f26fb 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -18705,10 +18705,17 @@ wsrep_innobase_kill_one_trx( /* Mark transaction as a victim for Galera abort */ victim_trx->lock.was_chosen_as_wsrep_victim= true; + if (wsrep_thd_set_wsrep_aborter(bf_thd, thd)) + { + WSREP_DEBUG("innodb kill transaction skipped due to wsrep_aborter set"); + wsrep_thd_UNLOCK(thd); + DBUG_RETURN(0); + } /* Note that we need to release this as it will be acquired below in wsrep-lib */ wsrep_thd_UNLOCK(thd); + DEBUG_SYNC(bf_thd, "before_wsrep_thd_abort"); if (wsrep_thd_bf_abort(bf_thd, thd, signal)) { |