summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@mariadb.com>2020-08-10 17:33:48 +0000
committerVladislav Vaintroub <wlad@mariadb.com>2020-08-10 17:33:48 +0000
commit4ea915e28c3fc8abd164977408f8a69b61e4a997 (patch)
treee31a0ea415c4d2a12769f99490686f791f6bba79 /sql/mysqld.cc
parent5611df6774a7e60f2fc84350b88b60753628466e (diff)
downloadmariadb-git-4ea915e28c3fc8abd164977408f8a69b61e4a997.tar.gz
MDEV-23279 main.named_pipe test timeouts if called twice in a row
The test timeouts, because mtr is waiting for pid file. The pid file is not there, because expected to fail mysqld startup (duplicate named pipe name), this startup removed pid file of the running mysqld instance. To fix, split handle_connections_win() into the initialization part, and accept/handle part, like it is done elsewhere. The initialization part runs before pid file handling, and aborts on errors , thus avoiding pid file overwrites.
Diffstat (limited to 'sql/mysqld.cc')
-rw-r--r--sql/mysqld.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index ec641801300..1fadc7ebaac 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -2526,6 +2526,11 @@ static void network_init(void)
#endif
}
#endif
+
+#ifdef _WIN32
+ network_init_win();
+#endif
+
DBUG_PRINT("info",("server started"));
DBUG_VOID_RETURN;
}