diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-04-27 13:28:13 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-04-27 13:28:13 +0300 |
| commit | c06845d6f04e092b64c105eb6786056cea2ab593 (patch) | |
| tree | cfd3f3abc32ab96fb918d3c00ffc68f072ca29bc /storage/innobase/srv/srv0conc.cc | |
| parent | 2c5067b6890974d0df335a833ed7a4e4c6ced183 (diff) | |
| parent | edbdfc2f995eb47ba49235195aca00888aeacbc4 (diff) | |
| download | mariadb-git-c06845d6f04e092b64c105eb6786056cea2ab593.tar.gz | |
Merge 10.1 into 10.2
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 347e604479a..9936635a055 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 @@ -122,8 +122,7 @@ srv_conc_enter_innodb_with_atomics( for (;;) { ulint sleep_in_us; #ifdef WITH_WSREP - if (wsrep_on(trx->mysql_thd) && - wsrep_trx_is_aborting(trx->mysql_thd)) { + if (trx->is_wsrep() && wsrep_trx_is_aborting(trx->mysql_thd)) { if (wsrep_debug) { ib::info() << "srv_conc_enter due to MUST_ABORT"; |