diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-13 08:40:05 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-13 08:40:05 +0300 |
commit | fd0bdd3180a7d5f4b9804d372d6a63b6a202818c (patch) | |
tree | dc239fc3cbf6c96078fcfc19615c56a2ddd920f4 | |
parent | 0ccb95c2a9c3107c7dfa1745a64c50d071fb8f4b (diff) | |
parent | fb70bb44d096f4117e9454740aa4fa0651a1a69e (diff) | |
download | mariadb-git-fd0bdd3180a7d5f4b9804d372d6a63b6a202818c.tar.gz |
Merge 10.5 into 10.6mariadb-10.6.10
-rw-r--r-- | storage/innobase/srv/srv0srv.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/storage/innobase/srv/srv0srv.cc b/storage/innobase/srv/srv0srv.cc index 207984b08ed..2ac6279a3b9 100644 --- a/storage/innobase/srv/srv0srv.cc +++ b/storage/innobase/srv/srv0srv.cc @@ -1974,8 +1974,7 @@ void srv_purge_shutdown() while(!srv_purge_should_exit()) { ut_a(!purge_sys.paused()); srv_wake_purge_thread_if_not_active(); - std::this_thread::sleep_for( - std::chrono::milliseconds(1)); + purge_coordinator_task.wait(); } purge_sys.coordinator_shutdown(); srv_shutdown_purge_tasks(); |