summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@mariadb.com>2022-11-21 12:09:21 +0100
committerVladislav Vaintroub <wlad@mariadb.com>2022-11-21 12:09:21 +0100
commitfaee972f18bebfab4bed5527741743807787ca69 (patch)
tree689b718ff7e89217d4384c4e20aba1885c861dbc
parentc9ccd978eb2ad136882e8990312991e5c99f18ef (diff)
parent3e0fd5e8a72ec8c6d48153113fb2987c2b456d17 (diff)
downloadmariadb-git-faee972f18bebfab4bed5527741743807787ca69.tar.gz
Merge branch '10.4' into 10.5
-rw-r--r--sql/sql_connect.cc1
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/sql_connect.cc b/sql/sql_connect.cc
index 57634329392..770e8f258fb 100644
--- a/sql/sql_connect.cc
+++ b/sql/sql_connect.cc
@@ -1110,7 +1110,6 @@ 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);
});