database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint

Browse Source 
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
This commit is contained in:
unknown
2007-03-01 19:10:07 +01:00
parent 4a9edcc32c 115a299ff3
commit 0e6a060c2d
3 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/mysqltest.c
View File

@@ -1694,12 +1694,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'",
@@ -1864,10 +1866,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'",
@@ -5954,7 +5958,9 @@ int main(int argc, char **argv)
init_builtin_echo(); init_builtin_echo();
#ifdef __WIN__ #ifdef __WIN__
#ifndef USE_CYGWIN
is_windows= 1; is_windows= 1;
#endif
init_tmp_sh_file(); init_tmp_sh_file();
init_win_path_patterns(); init_win_path_patterns();
#endif #endif

6
mysql-test/lib/mtr_misc.pl
View File

@@ -68,6 +68,12 @@ sub mtr_short_hostname () {
sub mtr_native_path($) sub mtr_native_path($)
{ {
my $path= shift; my $path= shift;
# MySQL version before 5.0 still use cygwin, no need
# to convert path
return $path
if ($::mysql_version_id < 50000);
$path=~ s/\//\\/g $path=~ s/\//\\/g
if ($::glob_win32); if ($::glob_win32);
return $path; return $path;

2
mysql-test/mysql-test-run.pl
View File

@@ -3793,7 +3793,7 @@ sub mysqld_arguments ($$$$$) {
if ( $mysql_version_id <= 50106 ) if ( $mysql_version_id <= 50106 )
{ {
# Force mysqld to use log files up until 5.1.6 # Force mysqld to use log files up until 5.1.6
mtr_add_arg($args, "%s--log=%s", $prefix, $master->[0]->{'path_mylog'}); mtr_add_arg($args, "%s--log=%s", $prefix, $slave->[0]->{'path_mylog'});
} }
else else
{ {