diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-08-12 18:23:42 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-08-12 18:25:35 +0300 |
| commit | be33124c9dc284c4409d02e5405de568b467a167 (patch) | |
| tree | 7188f6effdace66ce24af17fd1bd0d89f5b76999 /storage | |
| parent | fe8181aca13cf7ba1835fa6c89f297a1d0e79856 (diff) | |
| parent | 15c1ab52a9f2827724c5d007ce7b8c607dc8f0a9 (diff) | |
| download | mariadb-git-be33124c9dc284c4409d02e5405de568b467a167.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/handler/ha_innodb.cc | 6 | ||||
| -rw-r--r-- | storage/innobase/include/data0type.ic | 2 | ||||
| -rw-r--r-- | storage/xtradb/handler/ha_innodb.cc | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index db0fa4001c6..39adcea5f9d 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -1753,9 +1753,9 @@ innobase_srv_conc_enter_innodb( && thd_is_replication_slave_thread(trx->mysql_thd)) { const ulonglong end = my_interval_timer() + ulonglong(srv_replication_delay) * 1000000; - while (srv_conc_get_active_threads() - >= srv_thread_concurrency - || my_interval_timer() >= end) { + while ((srv_conc_get_active_threads() + >= srv_thread_concurrency) + && my_interval_timer() < end) { os_thread_sleep(2000 /* 2 ms */); } } else { diff --git a/storage/innobase/include/data0type.ic b/storage/innobase/include/data0type.ic index ae0fba11fe2..1956016c58b 100644 --- a/storage/innobase/include/data0type.ic +++ b/storage/innobase/include/data0type.ic @@ -1,7 +1,7 @@ /***************************************************************************** Copyright (c) 1996, 2014, Oracle and/or its affiliates. All Rights Reserved. -Copyright (c) 2017, 2018, MariaDB Corporation. +Copyright (c) 2017, 2019, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software diff --git a/storage/xtradb/handler/ha_innodb.cc b/storage/xtradb/handler/ha_innodb.cc index 9b324277acb..7bbd5068aa4 100644 --- a/storage/xtradb/handler/ha_innodb.cc +++ b/storage/xtradb/handler/ha_innodb.cc @@ -1954,9 +1954,9 @@ innobase_srv_conc_enter_innodb( && thd_is_replication_slave_thread(trx->mysql_thd)) { const ulonglong end = my_interval_timer() + ulonglong(srv_replication_delay) * 1000000; - while (srv_conc_get_active_threads() - >= srv_thread_concurrency - || my_interval_timer() >= end) { + while ((srv_conc_get_active_threads() + >= srv_thread_concurrency) + && my_interval_timer() < end) { os_thread_sleep(2000 /* 2 ms */); } } else { |