mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-29 10:14:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch '10.2' into bb-10.2-release

Browse source
This commit is contained in:
Sergei Golubchik 2018-05-17 11:25:35 +02:00
commit 50275321c3
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
storage/innobase/srv/srv0srv.cc
View file

@ -2876,8 +2876,18 @@ DECLARE_THREAD(srv_purge_coordinator_thread)(
#endif /* UNIV_DEBUG_THREAD_CREATION */
/* Ensure that all the worker threads quit. */
if (srv_n_purge_threads > 1) {
srv_release_threads(SRV_WORKER, srv_n_purge_threads - 1);
if (ulint n_workers = 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);