From: kent
Date: June 20 2005 7:37pm
Subject: bk commit into 4.1 tree (kent:1.2304) BUG#11466
List-Archive: http://lists.mysql.com/internals/26211
X-Bug: 11466
Message-Id: <20050620193756.F202F53E6D3@boortz.dyndns.org>

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.2304 05/06/20 21:37:39 kent@stripped +2 -0
  mtr_cases.pl:
    Bug#11466: Script can now get test case name
    from test case file path on command line
  mysql-test-run.pl:
    Bug#11466: Added --skip-ndbcluster/--skip-ndb option
  mtr_cases.pl:
    Don't set --default-time-zone if opt file sets it
    Restart the server if time zone is given in opt file
  mysql-test-run.pl:
    Don't remove symlink to "var" directory in cleanup
    Removed duplicate/unessesary options to mysqld

  mysql-test/lib/mtr_cases.pl
    1.6 05/06/20 21:33:14 kent@stripped +4 -2
    Bug#11466: Script can now get test case name
    from test case file path on command line

  mysql-test/mysql-test-run.pl
    1.29 05/06/20 21:31:53 kent@stripped +12 -0
    Bug#11466: Added --skip-ndbcluster/--skip-ndb option

  mysql-test/lib/mtr_cases.pl
    1.5 05/06/20 20:12:41 kent@stripped +45 -24
    Don't set --default-time-zone if opt file sets it
    Restart the server if time zone is given in opt file

  mysql-test/mysql-test-run.pl
    1.28 05/06/20 20:04:03 kent@stripped +2 -15
    Don't remove symlink to "var" directory in cleanup
    Removed duplicate/unessesary options to mysqld

# 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

--- 1.4/mysql-test/lib/mtr_cases.pl	2005-06-19 19:47:58 +02:00
+++ 1.6/mysql-test/lib/mtr_cases.pl	2005-06-20 21:33:14 +02:00
@@ -4,6 +4,7 @@
 # and is part of the translation of the Bourne shell script with the
 # same name.
 
+use File::Basename;
 use strict;
 
 sub collect_test_cases ($);
@@ -39,6 +40,7 @@
   if ( @::opt_cases )
   {
     foreach my $tname ( @::opt_cases ) { # Run in specified order, no sort
+      $tname= basename($tname, ".test");
       my $elem= "$tname.test";
       if ( ! -f "$testdir/$elem")
       {
@@ -161,52 +163,73 @@
   my $slave_sh=        "$testdir/$tname-slave.sh";
   my $disabled=        "$testdir/$tname.disabled";
 
-  $tinfo->{'master_opt'}= ["--default-time-zone=+3:00"];
-  $tinfo->{'slave_opt'}=  ["--default-time-zone=+3:00"];
+  $tinfo->{'master_opt'}= $::glob_win32 ? ["--default-time-zone=+3:00"] : [];
+  $tinfo->{'slave_opt'}=  $::glob_win32 ? ["--default-time-zone=+3:00"] : [];
   $tinfo->{'slave_mi'}=   [];
 
   if ( -f $master_opt_file )
   {
     $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
-    $tinfo->{'master_opt'}= mtr_get_opts_from_file($master_opt_file);
 
-    foreach my $opt (@{$tinfo->{'master_opt'}})
+  MASTER_OPT:
     {
-      my $value;
+      my $master_opt= mtr_get_opts_from_file($master_opt_file);
 
-      $value= mtr_match_prefix($opt, "--timezone=");
-
-      if ( defined $value )
+      foreach my $opt ( @$master_opt )
       {
-        $tinfo->{'timezone'}= $value;
-        $tinfo->{'master_opt'}= [];
-        $tinfo->{'master_restart'}= 0;
-        last;
-      }
+        my $value;
 
-      $value= mtr_match_prefix($opt, "--result-file=");
+        # 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
 
-      if ( defined $value )
-      {
-        $tinfo->{'result_file'}= "r/$value.result";
-        if ( $::opt_result_ext and $::opt_record or
-             -f "$tinfo->{'result_file'}$::opt_result_ext")
+        $value= mtr_match_prefix($opt, "--timezone=");
+        if ( defined $value )
+        {
+          $tinfo->{'timezone'}= $value;
+          $tinfo->{'skip'}= 1 if $::glob_win32; # FIXME server unsets TZ
+          last MASTER_OPT;
+        }
+
+        $value= mtr_match_prefix($opt, "--result-file=");
+        if ( defined $value )
+        {
+          $tinfo->{'result_file'}= "r/$value.result";
+          if ( $::opt_result_ext and $::opt_record or
+               -f "$tinfo->{'result_file'}$::opt_result_ext")
+          {
+            $tinfo->{'result_file'}.= $::opt_result_ext;
+          }
+          $tinfo->{'master_restart'}= 0;
+          last MASTER_OPT;
+        }
+
+        # If we set default time zone, remove the one we have
+        $value= mtr_match_prefix($opt, "--default-time-zone=");
+        if ( defined $value )
         {
-          $tinfo->{'result_file'}.= $::opt_result_ext;
+          $tinfo->{'master_opt'}= [];
         }
-        $tinfo->{'master_opt'}= [];
-        $tinfo->{'master_restart'}= 0;
-        last;
+
       }
+
+      # Ok, this was a real option list, add it
+      push(@{$tinfo->{'master_opt'}}, @$master_opt);
     }
   }
 
   if ( -f $slave_opt_file )
   {
-    $tinfo->{'slave_opt'}= mtr_get_opts_from_file($slave_opt_file);
     $tinfo->{'slave_restart'}= 1;
+    my $slave_opt= mtr_get_opts_from_file($slave_opt_file);
+
+    foreach my $opt ( @$slave_opt )
+    {
+      # If we set default time zone, remove the one we have
+      my $value= mtr_match_prefix($opt, "--default-time-zone=");
+      $tinfo->{'slave_opt'}= [] if defined $value;
+    }
+    push(@{$tinfo->{'slave_opt'}}, @$slave_opt);
   }
 
   if ( -f $slave_mi_file )

--- 1.27/mysql-test/mysql-test-run.pl	2005-06-20 12:30:59 +02:00
+++ 1.29/mysql-test/mysql-test-run.pl	2005-06-20 21:31:53 +02:00
@@ -264,6 +264,7 @@
 
 our $opt_udiff;
 
+our $opt_skip_ndbcluster;
 our $opt_with_ndbcluster;
 our $opt_with_openssl;
 
@@ -463,6 +464,7 @@
              # Control what test suites or cases to run
              'force'                    => \$opt_force,
              'with-ndbcluster'          => \$opt_with_ndbcluster,
+             'skip-ndbcluster|skip-ndb' => \$opt_skip_ndbcluster,
              'do-test=s'                => \$opt_do_test,
              'suite=s'                  => \$opt_suite,
              'skip-rpl'                 => \$opt_skip_rpl,
@@ -662,6 +664,11 @@
     $opt_ndbconnectstring= "host=localhost:$opt_ndbcluster_port";
   }
 
+  if ( $opt_skip_ndbcluster )
+  {
+    $opt_with_ndbcluster= 0;
+  }
+
   # FIXME
 
   #if ( $opt_valgrind or $opt_valgrind_all )
@@ -1020,11 +1027,6 @@
 
   mtr_report("Removing Stale Files");
 
-  if ( -l $opt_vardir and ! unlink($opt_vardir) )
-  {
-    mtr_error("Can't remove soft link \"$opt_vardir\"");
-  }
-
   rmtree("$opt_vardir/log");
   rmtree("$opt_vardir/ndbcluster-$opt_ndbcluster_port");
   rmtree("$opt_vardir/run");
@@ -1722,6 +1724,11 @@
     mtr_add_arg($args, "%s--local-infile", $prefix);
     mtr_add_arg($args, "%s--datadir=%s", $prefix,
                 $master->[$idx]->{'path_myddir'});
+
+    if ( $opt_skip_ndbcluster )
+    {
+      mtr_add_arg($args, "%s--skip-ndbcluster", $prefix);
+    }
   }
 
   if ( $type eq 'slave' )
@@ -1862,19 +1869,11 @@
     mtr_add_arg($args, "%s--rpl-recovery-rank=1", $prefix);
     mtr_add_arg($args, "%s--init-rpl-role=master", $prefix);
   }
-  else
+  elsif ( $type eq 'master' )
   {
     mtr_add_arg($args, "%s--exit-info=256", $prefix);
     mtr_add_arg($args, "%s--open-files-limit=1024", $prefix);
-
-    if ( $type eq 'master' )
-    {
-      mtr_add_arg($args, "%s--log=%s", $prefix, $master->[0]->{'path_mylog'});
-    }
-    if ( $type eq 'slave' )
-    {
-      mtr_add_arg($args, "%s--log=%s", $prefix, $slave->[0]->{'path_mylog'});
-    }
+    mtr_add_arg($args, "%s--log=%s", $prefix, $master->[0]->{'path_mylog'});
   }
 
   return $args;