diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2019-06-21 18:51:36 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2019-06-22 11:56:59 +0200 |
| commit | 72d3676fe5608d29c1200386de8a2ef4ecfe15b3 (patch) | |
| tree | 7742057a8a0c5f1c02c0d1a270ccb0d2e7eed425 | |
| parent | e9a692fe1ecd82e0812f4986a0010ca0db9295b7 (diff) | |
| download | mariadb-git-72d3676fe5608d29c1200386de8a2ef4ecfe15b3.tar.gz | |
remove workaround from MDEV-9409
| -rw-r--r-- | client/mysqltest.cc | 9 | ||||
| -rw-r--r-- | mysql-test/main/perror-win.result | 6 | ||||
| -rw-r--r-- | sql/mysqld.cc | 8 |
3 files changed, 5 insertions, 18 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc index 4b663ebd2cd..b5232b99e91 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.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 diff --git a/mysql-test/main/perror-win.result b/mysql-test/main/perror-win.result index 0e9d2e48a99..03d43abdb97 100644 --- a/mysql-test/main/perror-win.result +++ b/mysql-test/main/perror-win.result @@ -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 diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 289d45cddee..4f6255e81d1 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -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 |