Merge branch '10.4' into 10.5

# Conflicts:
#	sql/sql_connect.cc

2 files changed, 6 insertions, 16 deletions

diff --git a/sql/sql_connect.cc b/sql/sql_connect.cc
index 999830ff67e..57634329392 100644
--- a/sql/sql_connect.cc
+++ b/sql/sql_connect.cc
@@ -1108,6 +1108,12 @@ static int check_connection(THD *thd)
 
 void setup_connection_thread_globals(THD *thd)
 {
+  DBUG_EXECUTE_IF("CONNECT_wait", {
+    extern MYSQL_SOCKET unix_sock;
+    DBUG_ASSERT(unix_sock.fd >= 0);
+    while (unix_sock.fd >= 0)
+      my_sleep(1000);
+  });
   thd->store_globals();
 }
 
@@ -1359,14 +1365,6 @@ void do_handle_one_connection(CONNECT *connect, bool put_in_cache)
     return;
   }
 
-  DBUG_EXECUTE_IF("CONNECT_wait",
-  {
-    extern MYSQL_SOCKET unix_sock;
-    DBUG_ASSERT(unix_sock.fd >= 0);
-    while (unix_sock.fd >= 0)
-      my_sleep(1000);
-  });
-
   /*
     If a thread was created to handle this connection:
     increment slow_launch_threads counter if it took more than
diff --git a/sql/threadpool_common.cc b/sql/threadpool_common.cc
index 088c97ddb99..c4ab9697f8e 100644
--- a/sql/threadpool_common.cc
+++ b/sql/threadpool_common.cc
@@ -224,14 +224,6 @@ 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.