database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge remote-tracking branch 'origin/10.4' into 10.5

Browse Source
This commit is contained in:
Monty
2019-06-27 01:21:41 +03:00
parent 8e2a24bb33 bb702c2e4c
commit 1a41fc77dd
54 changed files with 1739 additions and 2891 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
client/mysqltest.cc
View File

@@ -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