Commit faee972f authored by Vladislav Vaintroub's avatar Vladislav Vaintroub

Merge branch '10.4' into 10.5

parents c9ccd978 3e0fd5e8
...@@ -1110,7 +1110,6 @@ void setup_connection_thread_globals(THD *thd) ...@@ -1110,7 +1110,6 @@ void setup_connection_thread_globals(THD *thd)
{ {
DBUG_EXECUTE_IF("CONNECT_wait", { DBUG_EXECUTE_IF("CONNECT_wait", {
extern MYSQL_SOCKET unix_sock; extern MYSQL_SOCKET unix_sock;
DBUG_ASSERT(unix_sock.fd >= 0);
while (unix_sock.fd >= 0) while (unix_sock.fd >= 0)
my_sleep(1000); my_sleep(1000);
}); });
......
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