diff options
| author | Monty <monty@mariadb.org> | 2019-06-27 01:21:41 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2019-06-27 01:21:41 +0300 |
| commit | 1a41fc77ddec7d93b0cf9be4123c86685e726b07 (patch) | |
| tree | f51e3de69f50e3377af0dce0dc1edfc68f70fbd3 /client | |
| parent | 8e2a24bb3339bb8d2bcef2a473e785a55a06dd59 (diff) | |
| parent | bb702c2e4c24632678b548ee1515c6a5b8173808 (diff) | |
| download | mariadb-git-1a41fc77ddec7d93b0cf9be4123c86685e726b07.tar.gz | |
Merge remote-tracking branch 'origin/10.4' into 10.5
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqltest.cc | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc index ffa22c80c3e..577c6fb5080 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 |