summaryrefslogtreecommitdiff
path: root/client/mysqltest.c
diff options
context:
space:
mode:
authorunknown <wax@kishkin.ru>2004-12-14 18:46:55 +0500
committerunknown <wax@kishkin.ru>2004-12-14 18:46:55 +0500
commit820d68d9033ed566177a4ff9c2c4c1e98b0deb6e (patch)
tree09a7b5e2571fc4f8e2de4cea9e832983faf5b711 /client/mysqltest.c
parenta88f6fda403e71d2f69736b8426b08b67e4c9c03 (diff)
downloadmariadb-git-820d68d9033ed566177a4ff9c2c4c1e98b0deb6e.tar.gz
corrected mysqltest.dsp
corrected mysql_test_run_new.dsp added dependency corrected path of mysql_test_run_new.dsp fixed wrong code added my_create_tables.c removed command_line fixed #elif restored NAME_MAX and MAX_FNAME added create_system_files() added compare() for windows added all files of testes in script added mysql-test in script BitKeeper/etc/ignore: Added mysql-4.1.8-win-src.zip to the ignore list VC++Files/client/mysqltest.dsp: corrected dsp file VC++Files/mysql-test/mysql_test_run_new.dsp: corrected mysql_test_run_new.dsp VC++Files/mysql.dsw: added dependency corrected path of mysql_test_run_new.dsp client/mysqltest.c: fixed wrong code mysql-test/Makefile.am: added my_create_tables.c mysql-test/my_manage.c: removed command_line fixed #elif mysql-test/my_manage.h: restored NAME_MAX and MAX_FNAME mysql-test/mysql_test_run_new.c: added create_system_files() added compare for windows scripts/make_win_src_distribution.sh: added all files of testes added mysql-test
Diffstat (limited to 'client/mysqltest.c')
-rw-r--r--client/mysqltest.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c
index dfaf48dd60e..18d5660d1a7 100644
--- a/client/mysqltest.c
+++ b/client/mysqltest.c
@@ -227,7 +227,7 @@ typedef struct
int alloced;
} VAR;
-#ifdef __NETWARE__
+#if defined(__NETWARE__) || defined(__WIN__)
/*
Netware doesn't proved environment variable substitution that is done
by the shell in unix environments. We do this in the following function:
@@ -4600,6 +4600,9 @@ static char *subst_env_var(const char *str)
*/
#undef popen /* Remove wrapper */
+#ifdef __WIN__
+#define popen _popen /* redefine for windows */
+#endif
FILE *my_popen(const char *cmd, const char *mode __attribute__((unused)))
{