Merge shellback.(none):/home/msvensson/mysql/work/my50-work

into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Auto merged

mysql-test/lib/mtr_process.pl

@@ -470,14 +470,6 @@ sub mtr_kill_leftovers () {
 
         mtr_debug("Got pid: $pid from file '$pidfile'");
 
-        # Race, could have been removed between I tested with -f
-        # and the unlink() below, so I better check again with -f
-
-        if ( ! unlink($pidfile) and -f $pidfile )
-        {
-          mtr_error("can't remove $pidfile");
-        }
-
         if ( $::glob_cygwin_perl or kill(0, $pid) )
         {
           mtr_debug("There is process with pid $pid -- scheduling for kill.");

mysql-test/lib/mtr_stress.pl

@@ -21,7 +21,6 @@ sub run_stress_test ()
 {
 
   my $args;
-  my $stress_basedir;
   my $stress_suitedir;
 
   mtr_report("Starting stress testing\n");

mysql-test/mysql-test-run.pl

@@ -1309,7 +1309,7 @@ sub kill_running_server () {
   {
     # Ensure that no old mysqld test servers are running
     # This is different from terminating processes we have
-    # started from ths run of the script, this is terminating
+    # started from this run of the script, this is terminating
     # leftovers from previous runs.
 
     mtr_report("Killing Possible Leftover Processes");
@@ -2748,7 +2748,7 @@ sub stop_masters () {
 
   my @args;
 
-  for ( my $idx; $idx < 2; $idx++ )
+  for ( my $idx= 0; $idx < 2; $idx++ )
   {
     # FIXME if we hit ^C before fully started, this test will prevent
     # the mysqld process from being killed
@@ -2779,7 +2779,7 @@ sub stop_slaves () {
 
   my @args;
 
-  for ( my $idx; $idx < 3; $idx++ )
+  for ( my $idx= 0; $idx < 3; $idx++ )
   {
     if ( $slave->[$idx]->{'pid'} )
     {