bk commit into 4.1 tree (kent:1.2324)

[kent]

Below is the list of changes that have just been committed into a local
4.1 repository of kent. When kent does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2324 05/06/10 21:29:37 kent@stripped +4 -0
  mtr_process.pl:
    Added a sleep for 5 seconds when shuting down,
    work around for strange problem with server restarts
  mtr_cases.pl:
    Set default time zone as opt to mysqld
  mysql-test-run.pl:
    Enabled --mysqld=<flags> to work
    Put some Windows path names into environment,
    to be used in --replace_result
  mysql-test-run.sh:
    Make shell script tolerant to Windows change in test cases

  mysql-test/lib/mtr_process.pl
    1.9 05/06/10 21:25:20 kent@stripped +2 -0
    Added a sleep for 5 seconds when shuting down,
    work around for strange problem with server restarts

  mysql-test/lib/mtr_cases.pl
    1.3 05/06/10 21:24:20 kent@stripped +6 -8
    Set default time zone as opt to mysqld

  mysql-test/mysql-test-run.pl
    1.22 05/06/10 21:21:51 kent@stripped +15 -3
    Enabled --mysqld=<flags> to work
    Put some Windows path names into environment,
    to be used in --replace_result

  mysql-test/mysql-test-run.sh
    1.253 05/06/10 21:20:13 kent@stripped +2 -1
    Make shell script tolerant to Windows change in test cases

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	kent
# Host:	g4.boortz.dyndns.org
# Root:	/Users/kent/mysql/bk/mysql-4.1-gca

--- 1.252/mysql-test/mysql-test-run.sh	2005-05-25 11:10:07 +02:00
+++ 1.253/mysql-test/mysql-test-run.sh	2005-06-10 21:20:13 +02:00
@@ -170,7 +170,8 @@
 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
 

--- 1.2/mysql-test/lib/mtr_cases.pl	2005-03-21 15:59:15 +01:00
+++ 1.3/mysql-test/lib/mtr_cases.pl	2005-06-10 21:24:20 +02:00
@@ -171,8 +171,8 @@
   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 @@
     $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 @@
       if ( defined $value )
       {
         $tinfo->{'timezone'}= $value;
-        $extra_master_opt= [];
+        $tinfo->{'master_opt'}= [];
         $tinfo->{'master_restart'}= 0;
         last;
       }
@@ -206,13 +206,11 @@
         {
           $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 )

--- 1.8/mysql-test/lib/mtr_process.pl	2005-06-05 20:04:19 +02:00
+++ 1.9/mysql-test/lib/mtr_process.pl	2005-06-10 21:25:20 +02:00
@@ -669,6 +669,8 @@
     last;                               # If we got here, we are done
   }
 
+  sleep(5) if $::glob_win32;            # FIXME next startup fails if no sleep
+
   return $res;
 }
 

--- 1.21/mysql-test/mysql-test-run.pl	2005-06-05 20:01:00 +02:00
+++ 1.22/mysql-test/mysql-test-run.pl	2005-06-10 21:21:51 +02:00
@@ -204,7 +204,7 @@
 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 @@
              '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 @@
   $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 @@
     }
   }
 
-  foreach my $arg ( @$extra_opt )
+  foreach my $arg ( @opt_extra_mysqld_opt, @$extra_opt )
   {
     mtr_add_arg($args, "%s%s", $prefix, $arg);
   }