List:Commits« Previous MessageNext Message »
From:Daniel Fischer Date:May 15 2007 9:32am
Subject:bk commit into 5.0 tree (df:1.2487) BUG#28370
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of df. When df 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-15 11:32:33+02:00, df@stripped +3 -0
  BUG#28370 federated test cases fail with binlog disabled

  mysql-test/include/federated.inc@stripped, 2007-05-15 11:32:31+02:00, df@stripped +1 -0
    BUG#28370 all federated tests require --log-bin for now

  mysql-test/mysql-test-run.pl@stripped, 2007-05-15 11:32:31+02:00, df@stripped +1 -2
    BUG#28370 detect --skip-log-bin option in mtr's --mysqld option

  mysql-test/r/have_log_bin.require@stripped, 2007-05-15 11:32:31+02:00, df@stripped +1 -1
    the variable is really called log_bin

# 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:	df
# Host:	pippilotta.erinye.com
# Root:	/shared/home/df/mysql/build/mysql-5.0-build-work-nn

--- 1.218/mysql-test/mysql-test-run.pl	2007-04-13 15:06:04 +02:00
+++ 1.219/mysql-test/mysql-test-run.pl	2007-05-15 11:32:31 +02:00
@@ -3740,8 +3740,7 @@
 	      "%s--log-slow-queries=%s-slow.log", $prefix, $log_base_path);
 
   # Check if "extra_opt" contains --skip-log-bin
-  my $skip_binlog= grep(/^--skip-log-bin/, @$extra_opt);
-
+  my $skip_binlog= grep(/^--skip-log-bin/, @$extra_opt, @opt_extra_mysqld_opt);
   if ( $mysqld->{'type'} eq 'master' )
   {
     if (! ($opt_skip_master_binlog || $skip_binlog) )

--- 1.3/mysql-test/include/federated.inc	2006-12-08 12:20:23 +01:00
+++ 1.4/mysql-test/include/federated.inc	2007-05-15 11:32:31 +02:00
@@ -1,3 +1,4 @@
+--source include/have_log_bin.inc
 --source include/not_embedded.inc
 --source ./include/have_federated_db.inc
 

--- 1.1/mysql-test/r/have_log_bin.require	2007-05-14 14:38:48 +02:00
+++ 1.2/mysql-test/r/have_log_bin.require	2007-05-15 11:32:31 +02:00
@@ -1,2 +1,2 @@
 Variable_name	Value
-have_log_bin	ON
+log_bin	ON
Thread
bk commit into 5.0 tree (df:1.2487) BUG#28370Daniel Fischer15 May