diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-04-27 17:38:17 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-04-27 17:38:17 +0300 |
| commit | b63446984c2c8441c19fc646f6652a9bc3076304 (patch) | |
| tree | a874d841721ba5d80f66e92e5e16dc0ab4233e2a /storage/innobase/srv/srv0conc.cc | |
| parent | 6dab094fbd31ef93a1d51b1b9c867188b2f958c3 (diff) | |
| parent | 3568fad5c935426a275900e8130657b18ba14e9f (diff) | |
| download | mariadb-git-b63446984c2c8441c19fc646f6652a9bc3076304.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'storage/innobase/srv/srv0conc.cc')
| -rw-r--r-- | storage/innobase/srv/srv0conc.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/storage/innobase/srv/srv0conc.cc b/storage/innobase/srv/srv0conc.cc index 157c2688c33..79a16f48a3b 100644 --- a/storage/innobase/srv/srv0conc.cc +++ b/storage/innobase/srv/srv0conc.cc @@ -1,7 +1,7 @@ /***************************************************************************** Copyright (c) 2011, 2015, Oracle and/or its affiliates. All Rights Reserved. -Copyright (c) 2015, 2018, MariaDB Corporation. +Copyright (c) 2015, 2020, MariaDB Corporation. Portions of this file contain modifications contributed and copyrighted by Google, Inc. Those modifications are gratefully acknowledged and are described @@ -118,8 +118,7 @@ srv_conc_enter_innodb_with_atomics( for (;;) { ulint sleep_in_us; #ifdef WITH_WSREP - if (wsrep_on(trx->mysql_thd) && - wsrep_thd_is_aborting(trx->mysql_thd)) { + if (trx->is_wsrep() && wsrep_thd_is_aborting(trx->mysql_thd)) { if (wsrep_get_debug()) { ib::info() << "srv_conc_enter due to MUST_ABORT"; |