Commit 8c5d64da authored by Vladislav Vaintroub's avatar Vladislav Vaintroub

Post-fix after MDEV-8540 - do not close stdin on Windows.

It is not open.
parent 0897a25c
...@@ -5149,8 +5149,10 @@ int win_main(int argc, char **argv) ...@@ -5149,8 +5149,10 @@ int win_main(int argc, char **argv)
int mysqld_main(int argc, char **argv) int mysqld_main(int argc, char **argv)
#endif #endif
{ {
#ifndef _WIN32
/* We can't close stdin just now, because it may be booststrap mode. */ /* We can't close stdin just now, because it may be booststrap mode. */
bool please_close_stdin= fcntl(STDIN_FILENO, F_GETFD) >= 0; bool please_close_stdin= fcntl(STDIN_FILENO, F_GETFD) >= 0;
#endif
/* /*
Perform basic thread library and malloc initialization, Perform basic thread library and malloc initialization,
...@@ -5495,9 +5497,12 @@ int mysqld_main(int argc, char **argv) ...@@ -5495,9 +5497,12 @@ int mysqld_main(int argc, char **argv)
(char*) "" : mysqld_unix_port), (char*) "" : mysqld_unix_port),
mysqld_port, mysqld_port,
MYSQL_COMPILATION_COMMENT); MYSQL_COMPILATION_COMMENT);
#ifndef _WIN32
/* Only close stdin if it was open initinally. */ /* Only close stdin if it was open initinally. */
if (please_close_stdin) if (please_close_stdin)
fclose(stdin); fclose(stdin);
#endif
#if defined(_WIN32) && !defined(EMBEDDED_LIBRARY) #if defined(_WIN32) && !defined(EMBEDDED_LIBRARY)
Service.SetRunning(); Service.SetRunning();
#endif #endif
......
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