Merge pull request #152 from zhang-lujie/kp-5.7-thread-pool-dev-kp

[Issue#147]Fix the bug of threadpool shutdown may be incomplete.
kunpengcompute · Sep 2, 2021 · c048096 · c048096
2 parents a0e81c6 + b96fe70
commit c048096
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/sql/threadpool_unix.cc b/sql/threadpool_unix.cc
@@ -1028,14 +1028,13 @@ static void thread_group_close(thread_group_t *thread_group)
   DBUG_ENTER("thread_group_close");
 
   mysql_mutex_lock(&thread_group->mutex);
+  thread_group->shutdown = true;
   if (thread_group->thread_count == 0) 
   {
     mysql_mutex_unlock(&thread_group->mutex);
     DBUG_VOID_RETURN;
   }
 
-  thread_group->shutdown= true; 
-
   if (pipe(thread_group->shutdown_pipe))
   {
     mysql_mutex_unlock(&thread_group->mutex);