bk commit into 5.0 tree (anozdrin:1.2259)

[Alexander Nozdrin]

Below is the list of changes that have just been committed into a local
5.0 repository of alik. When alik 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-09-05 17:42:59+04:00, anozdrin@alik. +1 -0
  Merge alik.:/mnt/raid/alik/MySQL/devel/5.0-tree
  into  alik.:/mnt/raid/alik/MySQL/devel/5.0-rt
  MERGE: 1.2244.12.9

  mysql-test/lib/mtr_process.pl@stripped, 2006-09-05 17:42:55+04:00, anozdrin@alik. +0 -0
    Auto merged
    MERGE: 1.34.1.1

# 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:	anozdrin
# Host:	alik.
# Root:	/mnt/raid/alik/MySQL/devel/5.0-rt/RESYNC

--- 1.35/mysql-test/lib/mtr_process.pl	2006-09-05 17:43:06 +04:00
+++ 1.36/mysql-test/lib/mtr_process.pl	2006-09-05 17:43:06 +04:00
@@ -409,6 +409,7 @@ sub mtr_kill_leftovers () {
 
     mtr_debug("  - Master mysqld " .
               "(idx: $idx; pid: '$pidfile'; socket: '$sockfile'; port: $port)");
+    $::master->[$idx]->{'pid'}= 0; # Assume we are done with it
   }
 
   for ( my $idx= 0; $idx < 3; $idx++ )
@@ -426,6 +427,8 @@ sub mtr_kill_leftovers () {
 
     mtr_debug("  - Slave mysqld " .
               "(idx: $idx; pid: '$pidfile'; socket: '$sockfile'; port: $port)");
+
+    $::slave->[$idx]->{'pid'}= 0; # Assume we are done with it
   }
 
   mtr_mysqladmin_shutdown(\@args, 20);