Merge 10.5 into 10.6

MariaDB · Sep 13, 2022 · fd0bdd3 · fd0bdd3
2 parents 0ccb95c + fb70bb4
commit fd0bdd3
Showing 1 changed file with 1 addition and 2 deletions.
diff --git 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();