Commit 50275321 authored by Sergei Golubchik's avatar Sergei Golubchik

Merge branch '10.2' into bb-10.2-release

parents bb045e79 a4e78007
...@@ -2876,8 +2876,18 @@ DECLARE_THREAD(srv_purge_coordinator_thread)( ...@@ -2876,8 +2876,18 @@ DECLARE_THREAD(srv_purge_coordinator_thread)(
#endif /* UNIV_DEBUG_THREAD_CREATION */ #endif /* UNIV_DEBUG_THREAD_CREATION */
/* Ensure that all the worker threads quit. */ /* Ensure that all the worker threads quit. */
if (srv_n_purge_threads > 1) { if (ulint n_workers = srv_n_purge_threads - 1) {
srv_release_threads(SRV_WORKER, srv_n_purge_threads - 1); const srv_slot_t* slot;
const srv_slot_t* const end = &srv_sys.sys_threads[
srv_sys.n_sys_threads];
do {
srv_release_threads(SRV_WORKER, n_workers);
srv_sys_mutex_enter();
for (slot = &srv_sys.sys_threads[2];
!slot++->in_use && slot < end; );
srv_sys_mutex_exit();
} while (slot < end);
} }
innobase_destroy_background_thd(thd); innobase_destroy_background_thd(thd);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment