diff options
| author | unknown <lars@mysql.com> | 2004-11-09 09:36:34 +0100 |
|---|---|---|
| committer | unknown <lars@mysql.com> | 2004-11-09 09:36:34 +0100 |
| commit | 0ebc3d49fb36426ea3f49b9fb48434b07e2fd6f7 (patch) | |
| tree | 2849a510fc60901ff223533c2ec1ba56ee64b89a /client | |
| parent | ed51422f3abcb6a1a1b9aa1cc11f72383aef962a (diff) | |
| parent | 96f3cd034f6e3631f4ebd609b3aae2c2d963bac2 (diff) | |
| download | mariadb-git-0ebc3d49fb36426ea3f49b9fb48434b07e2fd6f7.tar.gz | |
Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/bkroot/mysql-4.1
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqltest.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c index df80fc7bb66..a207da21af5 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -949,11 +949,7 @@ static void do_exec(struct st_query* q) while (fgets(buf, sizeof(buf), res_file)) replace_dynstr_append_mem(ds, buf, strlen(buf)); } -#ifndef __WIN__ error= pclose(res_file); -#else - error= _pclose(res_file); -#endif if (error != 0) die("command \"%s\" failed", cmd); @@ -4610,11 +4606,7 @@ FILE *my_popen(const char *cmd, const char *mode __attribute__((unused))) FILE *res_file; subst_cmd= subst_env_var(cmd); -#ifndef __WIN__ res_file= popen(subst_cmd, "r0"); -#else - res_file= _popen(subst_cmd, "r0"); -#endif my_free(subst_cmd, MYF(0)); return res_file; } |