Commit bf9da9fd authored by unknown's avatar unknown
Browse files

Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-gca 

into mysql.com:/Users/kent/mysql/bk/mysql-4.1
parents 41bb9bf9 4cc8730d

mysql-test/lib/mtr_cases.pl

+6 −8
Original line number Diff line number Diff line
@@ -171,8 +171,8 @@ sub collect_one_test_case($$$$$) { 
  my $slave_sh=        "$testdir/$tname-slave.sh";

  my $disabled=        "$testdir/$tname.disabled";



  $tinfo->{'master_opt'}= [];

  $tinfo->{'slave_opt'}=  [];

  $tinfo->{'master_opt'}= ["--default-time-zone=+3:00"];

  $tinfo->{'slave_opt'}=  ["--default-time-zone=+3:00"];

  $tinfo->{'slave_mi'}=   [];



  if ( -f $master_opt_file )
@@ -180,9 +180,9 @@ sub collect_one_test_case($$$$$) { 
    $tinfo->{'master_restart'}= 1;    # We think so for now

    # This is a dirty hack from old mysql-test-run, we use the opt file

    # to flag other things as well, it is not a opt list at all

    my $extra_master_opt= mtr_get_opts_from_file($master_opt_file);

    $tinfo->{'master_opt'}= mtr_get_opts_from_file($master_opt_file);



    foreach my $opt (@$extra_master_opt)

    foreach my $opt (@{$tinfo->{'master_opt'}})

    {

      my $value;
@@ -191,7 +191,7 @@ sub collect_one_test_case($$$$$) { 
      if ( defined $value )

      {

        $tinfo->{'timezone'}= $value;

        $extra_master_opt= [];

        $tinfo->{'master_opt'}= [];

        $tinfo->{'master_restart'}= 0;

        last;

      }
@@ -206,13 +206,11 @@ sub collect_one_test_case($$$$$) { 
        {

          $tinfo->{'result_file'}.= $::opt_result_ext;

        }

        $extra_master_opt= [];

        $tinfo->{'master_opt'}= [];

        $tinfo->{'master_restart'}= 0;

        last;

      }

    }



    $tinfo->{'master_opt'}= $extra_master_opt;

  }



  if ( -f $slave_opt_file )

mysql-test/lib/mtr_process.pl

+2 −0
Original line number Diff line number Diff line
@@ -669,6 +669,8 @@ sub mtr_mysqladmin_shutdown () { 
    last;                               # If we got here, we are done

  }



  sleep(5) if $::glob_win32;            # FIXME next startup fails if no sleep



  return $res;

}

mysql-test/mysql-test-run.pl

+15 −3
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ our $opt_bench= 0; 
our $opt_small_bench= 0;

our $opt_big_test= 0;            # Send --big-test to mysqltest



our $opt_extra_mysqld_opt;       # FIXME not handled

our @opt_extra_mysqld_opt;



our $opt_compress;

our $opt_current_test;
@@ -500,7 +500,7 @@ sub command_line_setup () { 
             'record'                   => \$opt_record,



             # ???

             'mysqld=s'                 => \$opt_extra_mysqld_opt,

             'mysqld=s'                 => \@opt_extra_mysqld_opt,



             # Run test on running server

             'extern'                   => \$opt_extern,
@@ -953,13 +953,25 @@ sub environment_setup () { 
  $ENV{'LC_COLLATE'}=         "C";

  $ENV{'USE_RUNNING_SERVER'}= $glob_use_running_server;

  $ENV{'MYSQL_TEST_DIR'}=     $glob_mysql_test_dir;

  $ENV{'MYSQL_TEST_WINDIR'}=  $glob_mysql_test_dir;

  $ENV{'MASTER_MYSOCK'}=      $master->[0]->{'path_mysock'};

  $ENV{'MASTER_WINMYSOCK'}=   $master->[0]->{'path_mysock'};

  $ENV{'MASTER_MYSOCK1'}=     $master->[1]->{'path_mysock'};

  $ENV{'MASTER_MYPORT'}=      $master->[0]->{'path_myport'};

  $ENV{'MASTER_MYPORT1'}=     $master->[1]->{'path_myport'};

  $ENV{'SLAVE_MYPORT'}=       $slave->[0]->{'path_myport'};

# $ENV{'MYSQL_TCP_PORT'}=     '@MYSQL_TCP_PORT@'; # FIXME

  $ENV{'MYSQL_TCP_PORT'}=     3306;



  if ( $glob_cygwin_perl )

  {

    foreach my $key ('MYSQL_TEST_WINDIR','MASTER_MYSOCK')

    {

      $ENV{$key}= `cygpath -w $ENV{$key}`;

      $ENV{$key} =~ s,\\,\\\\,g;

      chomp($ENV{$key});

    }

  }

}
@@ -1852,7 +1864,7 @@ sub mysqld_arguments ($$$$$) { 
    }

  }



  foreach my $arg ( @$extra_opt )

  foreach my $arg ( @opt_extra_mysqld_opt, @$extra_opt )

  {

    mtr_add_arg($args, "%s%s", $prefix, $arg);

  }

mysql-test/mysql-test-run.sh

+2 −1
Original line number Diff line number Diff line
@@ -170,7 +170,8 @@ cd .. 
BASEDIR=`pwd`

cd $CWD

MYSQL_TEST_DIR=$BASEDIR/mysql-test

export MYSQL_TEST_DIR

MYSQL_TEST_WINDIR=$MYSQL_TEST_DIR

export MYSQL_TEST_DIR MYSQL_TEST_WINDIR

STD_DATA=$MYSQL_TEST_DIR/std_data

hostname=`hostname`		# Installed in the mysql privilege table