Commit 72d3676f authored by Vladislav Vaintroub's avatar Vladislav Vaintroub

remove workaround from MDEV-9409

parent e9a692fe
...@@ -873,17 +873,10 @@ static char *my_fgets(char * s, int n, FILE * stream, int *len) ...@@ -873,17 +873,10 @@ static char *my_fgets(char * s, int n, FILE * stream, int *len)
/* /*
Wrapper for popen(). Wrapper for popen().
On Windows, uses binary mode to workaround
C runtime bug mentioned in MDEV-9409
*/ */
static FILE* my_popen(const char *cmd, const char *mode) static FILE* my_popen(const char *cmd, const char *mode)
{ {
FILE *f= popen(cmd, mode); return popen(cmd, mode);
#ifdef _WIN32
if (f)
_setmode(fileno(f), O_BINARY);
#endif
return f;
} }
#ifdef EMBEDDED_LIBRARY #ifdef EMBEDDED_LIBRARY
......
...@@ -5728,17 +5728,11 @@ int mysqld_main(int argc, char **argv) ...@@ -5728,17 +5728,11 @@ int mysqld_main(int argc, char **argv)
init_ssl(); init_ssl();
network_init(); network_init();
#ifdef __WIN__ #ifdef _WIN32
if (!opt_console) if (!opt_console)
{ {
FreeConsole(); // Remove window FreeConsole(); // Remove window
} }
if (fileno(stdin) >= 0)
{
/* Disable CRLF translation (MDEV-9409). */
_setmode(fileno(stdin), O_BINARY);
}
#endif #endif
#ifdef WITH_WSREP #ifdef WITH_WSREP
......
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