diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2021-05-14 08:37:49 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2021-05-14 08:38:13 +0300 |
| commit | ba1b327796e9902dd6e2dc8b480eb8058f3aa689 (patch) | |
| tree | fe1fe5a76fe1401e21a19edf368c9c457c7965e8 | |
| parent | 670ef2d970809a2fcdd98d74a7e8c0d892e88233 (diff) | |
| download | mariadb-git-bb-10.3-MDEV-25609.tar.gz | |
Fix try #3bb-10.3-MDEV-25609
| -rw-r--r-- | storage/innobase/handler/ha_innodb.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index 48fcc8fb376..a225c100505 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -19010,11 +19010,14 @@ no_victim: case WSREP_OK: break; case WSREP_TRX_MISSING: - WSREP_DEBUG("calcel commit trx missing: " + case WSREP_TRX_FAIL: + case WSREP_BF_ABORT: + WSREP_DEBUG("calcel commit trx: " "rcode %d wsrep_trx_id %ld trx: " - TRX_ID_FMT, - rcode, victim_trx->id, - wsrep_handle->trx_id); + TRX_ID_FMT, + rcode, + wsrep_handle->trx_id, + victim_trx->id); break; default: WSREP_ERROR( @@ -19025,7 +19028,6 @@ no_victim: /* note: kill_mysql() will block, if we cannot. * kill the lock holder first. */ - abort(); } } } |