diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-03-01 19:10:07 +0100 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-03-01 19:10:07 +0100 |
| commit | 0e6a060c2df76ab7a9a3fde2de6eaef60620b989 (patch) | |
| tree | daf8c2086f70af8fd2f407e5cfbb7e88d3d160b9 /client/mysqltest.c | |
| parent | 4a9edcc32c7addea01e7e5b80e452939e7de07c7 (diff) | |
| parent | 115a299ff3ce27b85d62ebc1b836c77e6fa4b5de (diff) | |
| download | mariadb-git-0e6a060c2df76ab7a9a3fde2de6eaef60620b989.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
client/mysqltest.c:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/lib/mtr_misc.pl:
Auto merged
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'client/mysqltest.c')
| -rw-r--r-- | client/mysqltest.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c index 84779ae73fc..58a0e90824c 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -1694,6 +1694,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) ; @@ -1701,6 +1702,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)); @@ -1864,10 +1866,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'", @@ -5954,7 +5958,9 @@ int main(int argc, char **argv) init_builtin_echo(); #ifdef __WIN__ +#ifndef USE_CYGWIN is_windows= 1; +#endif init_tmp_sh_file(); init_win_path_patterns(); #endif |