summaryrefslogtreecommitdiff
path: root/storage/innobase/handler/ha_innodb.cc
diff options
context:
space:
mode:
Diffstat (limited to 'storage/innobase/handler/ha_innodb.cc')
-rw-r--r--storage/innobase/handler/ha_innodb.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
index 081fcbd9c51..5dfe240631b 100644
--- a/storage/innobase/handler/ha_innodb.cc
+++ b/storage/innobase/handler/ha_innodb.cc
@@ -1686,9 +1686,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 {