Merge 10.5 into 10.6

55a344ff · Marko Mäkelä · 9608773f · 1fcd8db7 · 55a344ff
Commit 55a344ff authored Aug 31, 2021 by Marko Mäkelä
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

storage/innobase/srv/srv0srv.cc storage/innobase/srv/srv0srv.cc +1 -1

No files found.
--- a/storage/innobase/srv/srv0srv.cc
+++ b/storage/innobase/srv/srv0srv.cc
@@ -1972,7 +1972,7 @@ ulint srv_get_task_queue_length()
 void srv_purge_shutdown()
 {
 	if (purge_sys.enabled()) {
-		if (!srv_fast_shutdown)
+		if (!srv_fast_shutdown && !opt_bootstrap)
 			srv_update_purge_thread_count(innodb_purge_threads_MAX);
 		while(!srv_purge_should_exit()) {
 			ut_a(!purge_sys.paused());