List:Commits« Previous MessageNext Message »
From:Daniel Fischer Date:May 15 2007 10:23am
Subject:bk commit into 5.1 tree (df:1.2524)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 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 12:23:16+02:00, df@stripped +1 -0
  Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-nn
  into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-nn
  MERGE: 1.1810.2870.47

  mysql-test/t/mysqldump.test@stripped, 2007-05-15 12:23:12+02:00, df@stripped +0 -0
    Auto merged
    MERGE: 1.76.1.40

# 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.1-build-work-nn/RESYNC

--- 1.139/mysql-test/t/mysqldump.test	2007-05-01 06:29:03 +02:00
+++ 1.140/mysql-test/t/mysqldump.test	2007-05-15 12:23:12 +02:00
@@ -1,6 +1,9 @@
 # Embedded server doesn't support external clients
 --source include/not_embedded.inc
 
+# Binlog is required
+--source include/have_log_bin.inc
+
 --disable_warnings
 DROP TABLE IF EXISTS t1, `"t"1`, t1aa, t2, t2aa, t3;
 drop database if exists mysqldump_test_db;
Thread
bk commit into 5.1 tree (df:1.2524)Daniel Fischer15 May