Commit 115a299f authored by unknown's avatar unknown

Add two more USE_CYGWIN ifdefs to mysqltest

parent ec38bd7a
...@@ -1677,12 +1677,14 @@ void do_exec(struct st_command *command) ...@@ -1677,12 +1677,14 @@ void do_exec(struct st_command *command)
} }
#ifdef __WIN__ #ifdef __WIN__
#ifndef USE_CYGWIN
/* Replace /dev/null with NUL */ /* Replace /dev/null with NUL */
while(replace(&ds_cmd, "/dev/null", 9, "NUL", 3) == 0) while(replace(&ds_cmd, "/dev/null", 9, "NUL", 3) == 0)
; ;
/* Replace "closed stdout" with non existing output fd */ /* Replace "closed stdout" with non existing output fd */
while(replace(&ds_cmd, ">&-", 3, ">&4", 3) == 0) while(replace(&ds_cmd, ">&-", 3, ">&4", 3) == 0)
; ;
#endif
#endif #endif
DBUG_PRINT("info", ("Executing '%s' as '%s'", DBUG_PRINT("info", ("Executing '%s' as '%s'",
...@@ -1847,10 +1849,12 @@ void do_system(struct st_command *command) ...@@ -1847,10 +1849,12 @@ void do_system(struct st_command *command)
do_eval(&ds_cmd, command->first_argument, command->end, !is_windows); do_eval(&ds_cmd, command->first_argument, command->end, !is_windows);
#ifdef __WIN__ #ifdef __WIN__
#ifndef USE_CYGWIN
/* Replace /dev/null with NUL */ /* Replace /dev/null with NUL */
while(replace(&ds_cmd, "/dev/null", 9, "NUL", 3) == 0) while(replace(&ds_cmd, "/dev/null", 9, "NUL", 3) == 0)
; ;
#endif #endif
#endif
DBUG_PRINT("info", ("running system command '%s' as '%s'", DBUG_PRINT("info", ("running system command '%s' as '%s'",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment