Merge branch '10.4' into 10.5

1 files changed, 10 insertions, 3 deletions

diff --git a/sql/threadpool_common.cc b/sql/threadpool_common.cc
index e8eb0dcc29d..088c97ddb99 100644
--- a/sql/threadpool_common.cc
+++ b/sql/threadpool_common.cc
@@ -224,6 +224,14 @@ static THD* threadpool_add_connection(CONNECT *connect, void *scheduler_data)
 {
   THD *thd= NULL;
 
+  DBUG_EXECUTE_IF("CONNECT_wait",
+  {
+    extern MYSQL_SOCKET unix_sock;
+    DBUG_ASSERT(unix_sock.fd >= 0);
+    while (unix_sock.fd >= 0)
+      my_sleep(1000);
+  });
+
   /*
     Create a new connection context: mysys_thread_var and PSI thread
     Store them in THD.
@@ -241,10 +249,9 @@ static THD* threadpool_add_connection(CONNECT *connect, void *scheduler_data)
       my_thread_end();
     return NULL;
   }
-  delete connect;
-
   thd->event_scheduler.data = scheduler_data;
-  server_threads.insert(thd);
+  server_threads.insert(thd); // Make THD visible in show processlist
+  delete connect; // must be after server_threads.insert, see close_connections()
   thd->set_mysys_var(mysys_var);