diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-12-16 07:47:17 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-12-16 07:47:17 +0200 |
| commit | 28c89b7151bc3ebd7a3459e85f4c9b5e73529629 (patch) | |
| tree | ce50324e5d1054f59a7178bfdb426189998baf52 /sql/service_wsrep.cc | |
| parent | 745fd4b39f8aff6300682502ed2ddf61ee343866 (diff) | |
| parent | 8fa759a5762733d9f8a4050437fadcd255ecd1a2 (diff) | |
| download | mariadb-git-28c89b7151bc3ebd7a3459e85f4c9b5e73529629.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/service_wsrep.cc')
| -rw-r--r-- | sql/service_wsrep.cc | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/sql/service_wsrep.cc b/sql/service_wsrep.cc index b24f3cb511a..36ea311f59f 100644 --- a/sql/service_wsrep.cc +++ b/sql/service_wsrep.cc @@ -196,18 +196,10 @@ extern "C" void wsrep_handle_SR_rollback(THD *bf_thd, } } -extern "C" my_bool wsrep_thd_bf_abort(const THD *bf_thd, THD *victim_thd, +extern "C" my_bool wsrep_thd_bf_abort(THD *bf_thd, THD *victim_thd, my_bool signal) { - /* Note: do not store/reset globals before wsrep_bf_abort() call - to avoid losing BF thd context. */ - if (WSREP(victim_thd) && !victim_thd->wsrep_trx().active()) - { - WSREP_DEBUG("BF abort for non active transaction"); - wsrep_start_transaction(victim_thd, victim_thd->wsrep_next_trx_id()); - } my_bool ret= wsrep_bf_abort(bf_thd, victim_thd); - wsrep_store_threadvars((THD*)bf_thd); /* Send awake signal if victim was BF aborted or does not have wsrep on. Note that this should never interrupt RSU |