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

into mysql.com:/Users/kent/mysql/bk/mysql-5.0-build

mysql-test/lib/mtr_cases.pl

@@ -63,21 +63,24 @@ sub collect_test_cases ($) {
   # To speed things up, we sort first in if the test require a restart
   # or not, second in alphanumeric order.
 
-#  @$cases = sort {
+  if ( $::opt_reorder )
-#    if ( $a->{'master_restart'} and $b->{'master_restart'} or
+  {
-#         ! $a->{'master_restart'} and ! $b->{'master_restart'} )
+    @$cases = sort {
-#    {
+      if ( $a->{'master_restart'} and $b->{'master_restart'} or
-#      return $a->{'name'} cmp $b->{'name'};
+           ! $a->{'master_restart'} and ! $b->{'master_restart'} )
-#    }
+      {
-#    if ( $a->{'master_restart'} )
+        return $a->{'name'} cmp $b->{'name'};
-#    {
+      }
-#      return 1;                 # Is greater
+      if ( $a->{'master_restart'} )
-#    }
+      {
-#    else
+        return 1;                 # Is greater
-#    {
+      }
-#      return -1;                # Is less
+      else
-#    }
+      {
-#  } @$cases;
+        return -1;                # Is less
+      }
+    } @$cases;
+  }
 
   return $cases;
 }

mysql-test/lib/mtr_report.pl

@@ -89,12 +89,11 @@ sub mtr_report_test_passed ($) {
   my $tinfo= shift;
 
   my $timer=  "";
-# FIXME
+  if ( $::opt_timer and -f "$::glob_mysql_test_dir/var/log/timer" )
-#  if ( $::opt_timer and -f "$::glob_mysql_test_dir/var/log/timer" )
+  {
-#  {
+    $timer= mtr_fromfile("$::glob_mysql_test_dir/var/log/timer");
-#    $timer=  `cat var/log/timer`;
+    $timer= sprintf "%12s", $timer;
-#    $timer=  sprintf "%13s", $timer;
+  }
-#  }
   $tinfo->{'result'}= 'MTR_RES_PASSED';
   print "[ pass ]   $timer\n";
 }

mysql-test/mysql-test-run.pl

@@ -214,6 +214,7 @@ our $opt_embedded_server;
 our $opt_extern;
 our $opt_fast;
 our $opt_force;
+our $opt_reorder;
 
 our $opt_gcov;
 our $opt_gcov_err;
@@ -525,6 +526,7 @@ sub command_line_setup () {
              'local-master'             => \$opt_local_master,
              'netware'                  => \$opt_netware,
              'old-master'               => \$opt_old_master,
+             'reorder'                  => \$opt_reorder,
              'script-debug'             => \$opt_script_debug,
              'sleep=i'                  => \$opt_sleep,
              'socket=s'                 => \$opt_socket,
@@ -1365,7 +1367,10 @@ sub run_testcase ($) {
   mtr_report_test_name($tinfo);
 
   mtr_tofile($master->[0]->{'path_myerr'},"CURRENT_TEST: $tname\n");
-  do_before_start_master($tname,$tinfo->{'master_sh'});
+
+# FIXME test cases that depend on each other, prevent this from
+# being at this location.
+#  do_before_start_master($tname,$tinfo->{'master_sh'});
 
   # ----------------------------------------------------------------------
   # If any mysqld servers running died, we have to know
@@ -1397,6 +1402,8 @@ sub run_testcase ($) {
       }
       if ( ! $master->[0]->{'pid'} )
       {
+        # FIXME not correct location for do_before_start_master()
+        do_before_start_master($tname,$tinfo->{'master_sh'});
         $master->[0]->{'pid'}=
           mysqld_start('master',0,$tinfo->{'master_opt'},[]);
         if ( ! $master->[0]->{'pid'} )
@@ -1532,9 +1539,10 @@ sub do_before_start_master ($$) {
        $tname ne "rpl_crash_binlog_ib_3b")
   {
     # FIXME we really want separate dir for binlogs
-    # FIXME replace 'rm' in backticks with portable Perl function
+    foreach my $bin ( glob("$glob_mysql_test_dir/var/log/master*-bin.*") )
-    `rm -f $glob_mysql_test_dir/var/log/master-bin*`;
+    {
-#    unlink("$glob_mysql_test_dir/var/log/master-bin*");
+      unlink($bin);
+    }
   }
 
   # Remove old master.info and relay-log.info files
@@ -1568,9 +1576,10 @@ sub do_before_start_slave ($$) {
        $tname ne "rpl_crash_binlog_ib_3b" )
   {
     # FIXME we really want separate dir for binlogs
-    # FIXME replace 'rm' in backticks with portable Perl function
+    foreach my $bin ( glob("$glob_mysql_test_dir/var/log/slave*-bin.*") )
-    `rm -fr $glob_mysql_test_dir/var/log/slave*-bin.*`;
+    {
-#    unlink("$glob_mysql_test_dir/var/log/slave*-bin.*"); # FIXME idx???
+      unlink($bin);
+    }
     # FIXME really master?!
     unlink("$glob_mysql_test_dir/var/slave-data/master.info");
     unlink("$glob_mysql_test_dir/var/slave-data/relay-log.info");
@@ -1656,13 +1665,15 @@ sub mysqld_arguments ($$$$$) {
 
     mtr_add_arg($args, "%s--datadir=%s", $prefix,
                 $slave->[$idx]->{'path_myddir'});
+    % FIXME slave get this option twice?!
     mtr_add_arg($args, "%s--exit-info=256", $prefix);
     mtr_add_arg($args, "%s--init-rpl-role=slave", $prefix);
     mtr_add_arg($args, "%s--log-bin=%s/var/log/slave%s-bin", $prefix,
                 $glob_mysql_test_dir, $sidx); # FIXME use own dir for binlogs
     mtr_add_arg($args, "%s--log-slave-updates", $prefix);
+    % FIXME option duplicated for slave
     mtr_add_arg($args, "%s--log=%s", $prefix,
-                $slave->[$idx]->{'path_myerr'});
+                $slave->[$idx]->{'path_mylog'});
     mtr_add_arg($args, "%s--master-retry-count=10", $prefix);
     mtr_add_arg($args, "%s--pid-file=%s", $prefix,
                 $slave->[$idx]->{'path_mypid'});
@@ -2043,7 +2054,7 @@ sub run_mysqltest ($$) {
 
   if ( $opt_timer )
   {
-    mtr_add_arg($args, "--timer-file=var/log/timer");
+    mtr_add_arg($args, "--timer-file=%s/var/log/timer", $glob_mysql_test_dir);
   }
 
   if ( $opt_big_test )
@@ -2172,6 +2183,7 @@ Misc options
   timer                 Show test case execution time
   start-and-exit        Only initiate and start the "mysqld" servers
   fast                  Don't try to cleanup from earlier runs
+  reorder               Reorder tests to get less server restarts
   help                  Get this help text
   unified-diff | udiff  When presenting differences, use unified diff