bk commit into 5.1 tree (msvensson:1.2169)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson 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.2169 06/05/23 15:59:52 msvensson@shellback.(none) +3 -0
  Updated after review

  mysql-test/mysql-test-run.pl
    1.119 06/05/23 15:59:47 msvensson@shellback.(none) +12 -14
    Remove debug code
    Fix spelling errors
    Check if slave cluster installed ok if test needs it

  mysql-test/lib/mtr_report.pl
    1.28 06/05/23 15:59:47 msvensson@shellback.(none) +1 -1
    Fix spelling errors

  mysql-test/lib/mtr_process.pl
    1.36 06/05/23 15:59:47 msvensson@shellback.(none) +7 -7
    Fix spelling errors

# 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:	msvensson
# Host:	shellback.(none)
# Root:	/home/msvensson/mysql/mysql-5.1-new-maint

--- 1.35/mysql-test/lib/mtr_process.pl	2006-05-23 15:25:11 +02:00
+++ 1.36/mysql-test/lib/mtr_process.pl	2006-05-23 15:59:47 +02:00
@@ -297,7 +297,7 @@
           }
         }
 
-        mtr_debug("waitpid() catched exit of unknown child $ret_pid, " .
+        mtr_debug("waitpid() caught exit of unknown child $ret_pid, " .
                   "exit during mysqltest run");
       }
 
@@ -505,9 +505,9 @@
 }
 
 
-# Check that all processes in list is killed
+# Check that all processes in list are killed
 # The argument is a list of 'ports', 'pids', 'pidfiles' and 'socketfiles'
-# for which shutdown has been started. Make sure they all get killes
+# for which shutdown has been started. Make sure they all get killed
 # in one way or the other.
 #
 # FIXME On Cygwin, and maybe some other platforms, $srv->{'pid'} and
@@ -540,12 +540,12 @@
       $ret_pid= waitpid($srv->{'pid'},&WNOHANG);
       if ($ret_pid == $srv->{'pid'})
       {
-	mtr_verbose("Catched exit of process $ret_pid");
+	mtr_verbose("Caught exit of process $ret_pid");
 	$srv->{'pid'}= 0;
       }
       else
       {
-	# mtr_warning("catched exit of unknown child $ret_pid");
+	# mtr_warning("caught exit of unknown child $ret_pid");
       }
     }
   }
@@ -667,7 +667,7 @@
 
   # Wait for all the started processes to exit
   # As mysqladmin is such a simple program, we trust it to terminate itself.
-  # I.e. we wait blocking, and wait wait for them all before we go on.
+  # I.e. we wait blocking, and wait for them all before we go on.
   foreach my $pid (keys %{$admin_pids})
   {
     my $ret_pid= waitpid($pid,0);
@@ -789,7 +789,7 @@
   # -1 or 0 means there are no more procesess to wait for
   while ( ($ret_pid= waitpid(-1,&WNOHANG)) != 0 and $ret_pid != -1)
   {
-    mtr_warning("waitpid() catched exit of child $ret_pid");
+    mtr_warning("waitpid() caught exit of child $ret_pid");
     foreach my $idx (0..1)
     {
       if ( $::master->[$idx]->{'pid'} eq $ret_pid )

--- 1.27/mysql-test/lib/mtr_report.pl	2006-05-19 11:42:44 +02:00
+++ 1.28/mysql-test/lib/mtr_report.pl	2006-05-23 15:59:47 +02:00
@@ -204,7 +204,7 @@
       "http://www.mysql.com/doc/en/MySQL_test_suite.html\n";
   }
   print
-    "The servers was restarted $tot_restarts times\n";
+    "The servers were restarted $tot_restarts times\n";
 
   # ----------------------------------------------------------------------
   # If a debug run, there might be interesting information inside

--- 1.118/mysql-test/mysql-test-run.pl	2006-05-23 15:27:50 +02:00
+++ 1.119/mysql-test/mysql-test-run.pl	2006-05-23 15:59:47 +02:00
@@ -1602,18 +1602,7 @@
     s/CHOOSE_PORT_MGM/$cluster->{'port'}/;
     s/CHOOSE_DiskPageBufferMemory/$ndb_pbmem/;
 
-#    if ( /^\s*$/ )
-#    {
-#      print OUT "\n";
-#    }
-#    elsif (/;$/)
-#    {
-#      print OUT "$_\n";
-#    }
-#    else
-#    {
-      print OUT "$_ \n";
-#    }
+    print OUT "$_ \n";
   }
   close OUT;
   close IN;
@@ -2178,13 +2167,22 @@
     return;
   }
 
-  # FIXME if test need slave cluster, check if that is installed_ok
+  # If test needs cluster, check that master installed ok
   if ( $tinfo->{'ndb_test'}  and $clusters->[0]->{'installed_ok'} eq "NO" )
   {
     mtr_report_test_name($tinfo);
     mtr_report_test_failed($tinfo);
     return;
-  }  
+  }
+
+  # If test needs slave cluster, check that it installed ok
+  if ( $tinfo->{'ndb_test'}  and $tinfo->{'slave_num'} and
+       $clusters->[1]->{'installed_ok'} eq "NO" )
+  {
+    mtr_report_test_name($tinfo);
+    mtr_report_test_failed($tinfo);
+    return;
+  }
 
   run_testcase_stop_servers($tinfo);