diff options
| author | unknown <wax@mysql.com> | 2004-11-04 21:25:49 +0500 |
|---|---|---|
| committer | unknown <wax@mysql.com> | 2004-11-04 21:25:49 +0500 |
| commit | a941f1486f909de627226f888cd15cb90ed9becc (patch) | |
| tree | ad6fdc58df19bf9bb503d896c0123667f40b56fe /client | |
| parent | 02af97cc3431075b1b81826e6933251cf61cfb8e (diff) | |
| parent | 716e3a577c59e4b8a38270c02a69f0492f79c685 (diff) | |
| download | mariadb-git-a941f1486f909de627226f888cd15cb90ed9becc.tar.gz | |
autocommit
mysql-test/r/fulltext.result:
Auto merged
mysql-test/t/fulltext.test:
Auto merged
mysql-test/t/insert.test:
Auto merged
mysql-test/t/type_float.test:
Auto merged
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqltest.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c index aef36823dfc..a635b5bdd11 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -4516,8 +4516,7 @@ static void get_replace_column(struct st_query *q) my_free(start, MYF(0)); } -#ifdef __NETWARE__ - +#if defined(__NETWARE__) || defined(__WIN__) /* Substitute environment variables with text. @@ -4608,9 +4607,13 @@ 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; } -#endif /* __NETWARE__ */ +#endif /* __NETWARE__ or __WIN__*/ |