summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormsvensson@pilot.blaudden <>2007-03-01 19:09:43 +0100
committermsvensson@pilot.blaudden <>2007-03-01 19:09:43 +0100
commitc0fdf1792ae17351b0673f3f994fd0c81f6c5dc9 (patch)
tree5a03780e25d3fb23959a2f2c8d5ce7f227aa11e8
parent86625d711fad3764d14cbfacaddff0cabbb34467 (diff)
downloadmariadb-git-c0fdf1792ae17351b0673f3f994fd0c81f6c5dc9.tar.gz
Add two more USE_CYGWIN ifdefs to mysqltest
-rw-r--r--client/mysqltest.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c
index f678eb98eec..d9f1f25e093 100644
--- a/client/mysqltest.c
+++ b/client/mysqltest.c
@@ -1677,6 +1677,7 @@ void do_exec(struct st_command *command)
}
#ifdef __WIN__
+#ifndef USE_CYGWIN
/* Replace /dev/null with NUL */
while(replace(&ds_cmd, "/dev/null", 9, "NUL", 3) == 0)
;
@@ -1684,6 +1685,7 @@ void do_exec(struct st_command *command)
while(replace(&ds_cmd, ">&-", 3, ">&4", 3) == 0)
;
#endif
+#endif
DBUG_PRINT("info", ("Executing '%s' as '%s'",
command->first_argument, ds_cmd.str));
@@ -1847,10 +1849,12 @@ void do_system(struct st_command *command)
do_eval(&ds_cmd, command->first_argument, command->end, !is_windows);
#ifdef __WIN__
+#ifndef USE_CYGWIN
/* Replace /dev/null with NUL */
while(replace(&ds_cmd, "/dev/null", 9, "NUL", 3) == 0)
;
#endif
+#endif
DBUG_PRINT("info", ("running system command '%s' as '%s'",