Skip to content
Permalink
Browse files

remove workaround from MDEV-9409

  • Loading branch information...
vaintroub committed Jun 21, 2019
1 parent e9a692f commit 72d3676fe5608d29c1200386de8a2ef4ecfe15b3
Showing with 5 additions and 18 deletions.
  1. +1 −8 client/mysqltest.cc
  2. +3 −3 mysql-test/main/perror-win.result
  3. +1 −7 sql/mysqld.cc
@@ -873,17 +873,10 @@ static char *my_fgets(char * s, int n, FILE * stream, int *len)

/*
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)
{
FILE *f= popen(cmd, mode);
#ifdef _WIN32
if (f)
_setmode(fileno(f), O_BINARY);
#endif
return f;
return popen(cmd, mode);
}

#ifdef EMBEDDED_LIBRARY
@@ -1,7 +1,7 @@
MariaDB error code 150: Foreign key constraint is incorrectly formed
Win32 error code 150: System trace information was not specified in your CONFIG.SYS file, or tracing is disallowed.
Win32 error code 150: System trace information was not specified in your CONFIG.SYS file, or tracing is disallowed.
OS error code 23: Too many open files in system
Win32 error code 23: Data error (cyclic redundancy check).
Win32 error code 23: Data error (cyclic redundancy check).
MariaDB error code 1062 (ER_DUP_ENTRY): Duplicate entry '%-.192s' for key %d
Win32 error code 1062: The service has not been started.
Win32 error code 1062: The service has not been started.
Illegal error code: 30000
@@ -5728,17 +5728,11 @@ int mysqld_main(int argc, char **argv)
init_ssl();
network_init();

#ifdef __WIN__
#ifdef _WIN32
if (!opt_console)
{
FreeConsole(); // Remove window
}

if (fileno(stdin) >= 0)
{
/* Disable CRLF translation (MDEV-9409). */
_setmode(fileno(stdin), O_BINARY);
}
#endif

#ifdef WITH_WSREP

0 comments on commit 72d3676

Please sign in to comment.
You can’t perform that action at this time.