Merge 10.5 into 10.6

dr-m · dr-m · commit 55a344ffa38f · 2021-08-31T13:56:15.000+03:00
diff --git 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());

Original file line number	Diff line number	Diff line change
`@@ -1972,7 +1972,7 @@ ulint srv_get_task_queue_length()`
`1972`	`1972`	`void srv_purge_shutdown()`
`1973`	`1973`	`{`
`1974`	`1974`	`if (purge_sys.enabled()) {`
`1975`		`- if (!srv_fast_shutdown)`
	`1975`	`+ if (!srv_fast_shutdown && !opt_bootstrap)`
`1976`	`1976`	`srv_update_purge_thread_count(innodb_purge_threads_MAX);`
`1977`	`1977`	`while(!srv_purge_should_exit()) {`
`1978`	`1978`	`ut_a(!purge_sys.paused());`