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 10.4 into 10.5

Browse Source
This commit is contained in:
Marko Mäkelä
2019-11-19 10:45:28 +08:00
parent 6d373e8b81 589a1235b6
commit a9846f3299
28 changed files with 633 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/mysql_upgrade.c
View File

@@ -383,7 +383,7 @@ static int run_command(char* cmd,
if (opt_verbose >= 4)
puts(cmd);
if (!(res_file= popen(cmd, "r")))
if (!(res_file= my_popen(cmd, IF_WIN("rt","r"))))
die("popen(\"%s\", \"r\") failed", cmd);
while (fgets(buf, sizeof(buf), res_file))
@@ -401,7 +401,7 @@ static int run_command(char* cmd,
}
}
error= pclose(res_file);
error= my_pclose(res_file);
return WEXITSTATUS(error);
}