bk commit into 5.1 tree (mats:1.2585)

[Mats Kindahl]

Below is the list of changes that have just been committed into a local
5.1 repository of mats. When mats 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-31 23:23:05+02:00, mats@stripped +3 -0
  WL#3303 (RBR: Engine-controlled logging format):
  Fixing result files from tests.

  BitKeeper/deleted/.del-ndb_binlog_basic2.result@stripped, 2007-05-31 13:23:39+02:00, mats@stripped +0 -0
    Delete: mysql-test/r/ndb_binlog_basic2.result

  BitKeeper/deleted/.del-ndb_binlog_basic2.test@stripped, 2007-05-31 13:23:32+02:00, mats@stripped +0 -0
    Delete: mysql-test/t/ndb_binlog_basic2.test

  mysql-test/r/binlog_multi_engine.result@stripped, 2007-05-31 23:23:01+02:00, mats@stripped +3 -2
    Result change.

# 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:	mats
# Host:	kindahl-laptop.dnsalias.net
# Root:	/home/bk/w3303-mysql-5.1-rpl

--- 1.1/mysql-test/r/binlog_multi_engine.result	2007-05-31 23:23:14 +02:00
+++ 1.2/mysql-test/r/binlog_multi_engine.result	2007-05-31 23:23:14 +02:00
@@ -51,9 +51,10 @@
 master-bin.000001	#	Query	#	#	use `test`; TRUNCATE t1n
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1m VALUES (1,1), (1,2), (2,1), (2,2)
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1b VALUES (1,1), (1,2), (2,1), (2,2)
-master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1n VALUES (1,1), (1,2), (2,1), (2,2)
 master-bin.000001	#	Query	#	#	use `test`; UPDATE t1m, t1b SET m = 2, b = 3 WHERE n = c
-master-bin.000001	#	Query	#	#	use `test`; UPDATE t1m, t1n SET m = 2, e = 3 WHERE n = f
+master-bin.000001	#	Table_map	#	#	table_id: # (test.t1m)
+master-bin.000001	#	Table_map	#	#	table_id: # (test.t1n)
+master-bin.000001	#	Update_rows	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Query	#	#	use `test`; TRUNCATE t1m
 master-bin.000001	#	Query	#	#	use `test`; TRUNCATE t1b
 master-bin.000001	#	Query	#	#	BEGIN