bk commit into 5.1 tree (msvensson:1.2419)

[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@stripped, 2007-02-06 12:38:59+01:00, msvensson@stripped +2 -0
  Merge pilot.mysql.com:/home/msvensson/mysql/bug24805/my50-bug24805
  into  pilot.mysql.com:/home/msvensson/mysql/bug24805/my51-bug24805
  MERGE: 1.1810.2536.2

  mysql-test/mysql-test-run.pl@stripped, 2007-02-06 12:38:17+01:00, msvensson@stripped +4 -4
    Auto merged
    MERGE: 1.30.71.1

  mysql-test/t/disabled.def@stripped, 2007-02-06 12:38:57+01:00, msvensson@stripped +0 -1
    Manual merge
    MERGE: 1.2.10.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:	msvensson
# Host:	pilot.mysql.com
# Root:	/home/msvensson/mysql/bug24805/my51-bug24805/RESYNC

--- 1.264/mysql-test/mysql-test-run.pl	2007-01-31 22:24:14 +01:00
+++ 1.265/mysql-test/mysql-test-run.pl	2007-02-06 12:38:17 +01:00
@@ -3615,13 +3615,14 @@
     }
   }
 
-  my $pidfile;
+  # Check if "extra_opt" contains --skip-log-bin
+  my $skip_binlog= index(join(" ", @$extra_opt), "--skip-log-bin") >= 0;
 
   if ( $type eq 'master' )
   {
     my $id= $idx > 0 ? $idx + 101 : 1;
 
-    if (! $opt_skip_master_binlog)
+    if (! ($opt_skip_master_binlog || $skip_binlog) )
     {
       mtr_add_arg($args, "%s--log-bin=%s/log/master-bin%s", $prefix,
                   $opt_vardir, $sidx);
@@ -3683,7 +3684,7 @@
     mtr_add_arg($args, "%s--datadir=%s", $prefix,
                 $slave->[$idx]->{'path_myddir'});
     mtr_add_arg($args, "%s--init-rpl-role=slave", $prefix);
-    if (! $opt_skip_slave_binlog)
+    if (! ( $opt_skip_slave_binlog || $skip_binlog ))
     {
       mtr_add_arg($args, "%s--log-bin=%s/log/slave%s-bin", $prefix,
                   $opt_vardir, $sidx); # FIXME use own dir for binlogs
@@ -3819,6 +3820,10 @@
     if ($arg eq "--skip-core-file")
     {
       $found_skip_core= 1;
+    }
+    elsif ($skip_binlog and mtr_match_prefix($arg, "--binlog-format"))
+    {
+      ; # Dont add --binlog-format when running without binlog
     }
     else
     {

--- 1.229/mysql-test/t/disabled.def	2007-01-24 20:15:11 +01:00
+++ 1.230/mysql-test/t/disabled.def	2007-02-06 12:38:57 +01:00
@@ -36,7 +36,6 @@
 #ndb_binlog_discover      : bug#21806 2006-08-24
 #ndb_autodiscover3        : bug#21806
 
-flush2                   : Bug#24805 Pushbuild can't handle test with --disable-log-bin
 mysql_upgrade            : Bug#25074 mysql_upgrade gives inconsisten results
 plugin                   : Bug#25659 memory leak via "plugins" test