bk commit into 5.0 tree (msvensson:1.2312)

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 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@stripped, 2006-10-18 17:16:53+02:00, msvensson@shellback.(none) +3 -0
  Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
  into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
  MERGE: 1.1616.2144.233

  mysql-test/lib/mtr_process.pl@stripped, 2006-10-18 17:16:49+02:00, msvensson@shellback.(none) +0 -0
    Auto merged
    MERGE: 1.15.1.10

  mysql-test/lib/mtr_timer.pl@stripped, 2006-10-18 17:16:49+02:00, msvensson@shellback.(none) +0 -0
    Auto merged
    MERGE: 1.1.1.6

  mysql-test/mysql-test-run.pl@stripped, 2006-10-18 17:16:49+02:00, msvensson@shellback.(none) +0 -0
    Auto merged
    MERGE: 1.8.9.61

# 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.0-maint/RESYNC

--- 1.40/mysql-test/lib/mtr_process.pl	2006-10-18 17:16:59 +02:00
+++ 1.41/mysql-test/lib/mtr_process.pl	2006-10-18 17:16:59 +02:00
@@ -8,7 +8,6 @@
 use Errno;
 use strict;
 
-#use POSIX ":sys_wait_h";
 use POSIX 'WNOHANG';
 
 sub mtr_run ($$$$$$;$);
@@ -1088,7 +1087,6 @@
 
 sub mtr_exit ($) {
   my $code= shift;
-#  cluck("Called mtr_exit()");
   mtr_timer_stop_all($::glob_timers);
   local $SIG{HUP} = 'IGNORE';
   # ToDo: Signalling -$$ will only work if we are the process group

--- 1.10/mysql-test/lib/mtr_timer.pl	2006-10-18 17:16:59 +02:00
+++ 1.11/mysql-test/lib/mtr_timer.pl	2006-10-18 17:16:59 +02:00
@@ -8,9 +8,6 @@
 use Errno;
 use strict;
 
-#use POSIX ":sys_wait_h";
-#use POSIX 'WNOHANG';
-
 sub mtr_init_timers ();
 sub mtr_timer_start($$$);
 sub mtr_timer_stop($$);
@@ -142,10 +139,8 @@
 
   return "" unless exists $timers->{'pids'}->{$pid};
 
-  # We got a timeout
-  my $name= $timers->{'pids'}->{$pid};
-  mtr_timer_stop($timers, $name);
-  return $name;
+  # We got a timeout, return the name ot the timer
+  return $timers->{'pids'}->{$pid};
 }
 
 1;

--- 1.133/mysql-test/mysql-test-run.pl	2006-10-18 17:16:59 +02:00
+++ 1.134/mysql-test/mysql-test-run.pl	2006-10-18 17:16:59 +02:00
@@ -2913,6 +2913,7 @@
   # ----------------------------------------------------------------------
   if ( $opt_start_and_exit or $opt_start_dirty )
   {
+    mtr_timer_stop_all($glob_timers);
     mtr_report("\nServers started, exiting");
     exit(0);
   }