From: Date: January 7 2006 12:16am
Subject: bk commit into 5.1 tree (jimw:1.2048)
List-Archive: http://lists.mysql.com/commits/730
Message-Id: <20060106231652.ED952A8D88@rama.trainedmonkey.com>

Below is the list of changes that have just been committed into a local
5.1 repository of jimw. When jimw 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
  1.2048 06/01/06 15:16:44 jimw@stripped +1 -0
  Fix result after merge

  mysql-test/r/binlog_stm_blackhole.result
    1.8 06/01/06 15:16:40 jimw@stripped +1 -0
    Update results

# 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:	jimw
# Host:	rama.(none)
# Root:	/home/jimw/my/mysql-5.1-clean

--- 1.7/mysql-test/r/binlog_stm_blackhole.result	2005-12-21 20:10:54 -08:00
+++ 1.8/mysql-test/r/binlog_stm_blackhole.result	2006-01-06 15:16:40 -08:00
@@ -121,6 +121,7 @@
 master-bin.000001	#	Query	1	#	use `test`; COMMIT
 master-bin.000001	#	Query	1	#	use `test`; create table t2 (a varchar(200)) engine=blackhole
 master-bin.000001	#	Begin_load_query	1	#	;file_id=1;block_len=581
+master-bin.000001	#	Query	1	#	use `test`; COMMIT
 master-bin.000001	#	Execute_load_query	1	#	use `test`; load data infile '../../std_data/words.dat' into table t2 ;file_id=1
 master-bin.000001	#	Query	1	#	use `test`; COMMIT
 master-bin.000001	#	Query	1	#	use `test`; alter table t1 add b int