Commit 0e6a060c authored by unknown's avatar unknown
Browse files

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
parents 4a9edcc3 115a299f

client/mysqltest.c

+6 −0
Original line number Diff line number Diff line
@@ -1694,12 +1694,14 @@ 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)

    ;

  /* Replace "closed stdout" with non existing output fd */

  while(replace(&ds_cmd, ">&-", 3, ">&4", 3) == 0)

    ;

#endif

#endif



  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);



#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

mysql-test/lib/mtr_misc.pl

+6 −0
Original line number Diff line number Diff line
@@ -68,6 +68,12 @@ sub mtr_short_hostname () { 
sub mtr_native_path($)

{

  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

    if ($::glob_win32);

  return $path;

mysql-test/mysql-test-run.pl

+1 −1
Original line number Diff line number Diff line
@@ -3793,7 +3793,7 @@ sub mysqld_arguments ($$$$$) { 
    if ( $mysql_version_id <= 50106 )

    {

      # 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

    {