bk commit into 5.0 tree (msvensson:1.2505)

[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, 2007-05-28 20:23:00+02:00, msvensson@pilot.(none) +1 -0
  Merge pilot.(none):/data/msvensson/mysql/mysql-4.1-maint
  into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
  MERGE: 1.1616.2877.103

  mysql-test/mysql-test-run.pl@stripped, 2007-05-28 20:22:58+02:00, msvensson@pilot.(none) +0
-0
    Auto merged
    MERGE: 1.8.20.13

# 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:	pilot.(none)
# Root:	/data/msvensson/mysql/mysql-5.0-maint/RESYNC

--- 1.223/mysql-test/mysql-test-run.pl	2007-05-28 19:20:33 +02:00
+++ 1.224/mysql-test/mysql-test-run.pl	2007-05-28 20:22:58 +02:00
@@ -3608,6 +3608,9 @@
 
   # FIXME what about second master.....
 
+  # Don't delete anything if starting dirty
+  return if ($opt_start_dirty);
+
   foreach my $bin ( glob("$opt_vardir/log/master*-bin*") )
   {
     unlink($bin);
@@ -3638,6 +3641,9 @@
 
   my $tname= $tinfo->{'name'};
   my $init_script= $tinfo->{'master_sh'};
+
+  # Don't delete anything if starting dirty
+  return if ($opt_start_dirty);
 
   foreach my $bin ( glob("$opt_vardir/log/slave*-bin*") )
   {