diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2018-07-02 15:22:52 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2018-07-02 15:22:52 +0100 |
| commit | 8c5d64dafb3051749f3762cbad88553568abbb16 (patch) | |
| tree | 1c3700d2037c8e84462dac86e02c4b568bd44f56 | |
| parent | 0897a25c0f0b9b86590fd581795aa64b3fbef009 (diff) | |
| download | mariadb-git-8c5d64dafb3051749f3762cbad88553568abbb16.tar.gz | |
Post-fix after MDEV-8540 - do not close stdin on Windows.
It is not open.
| -rw-r--r-- | sql/mysqld.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index d760986a303..75d6cca7fda 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -5149,8 +5149,10 @@ int win_main(int argc, char **argv) int mysqld_main(int argc, char **argv) #endif { +#ifndef _WIN32 /* We can't close stdin just now, because it may be booststrap mode. */ bool please_close_stdin= fcntl(STDIN_FILENO, F_GETFD) >= 0; +#endif /* Perform basic thread library and malloc initialization, @@ -5495,9 +5497,12 @@ int mysqld_main(int argc, char **argv) (char*) "" : mysqld_unix_port), mysqld_port, MYSQL_COMPILATION_COMMENT); +#ifndef _WIN32 /* Only close stdin if it was open initinally. */ if (please_close_stdin) fclose(stdin); +#endif + #if defined(_WIN32) && !defined(EMBEDDED_LIBRARY) Service.SetRunning(); #endif |