bzr commit into mysql-6.0-bugteam branch (aelkin:2782) Bug#33420

[Andrei Elkin]

#At file:///home/andrei/MySQL/BZR/FIXES/6.0-bt-bug40221/

 2782 Andrei Elkin	2008-12-08 [merge]
      merge 5.1-bt with Bug #33420 fixes to 6.0-bt.
modified:
  mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result

per-file messages:
  mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result
    results are corrected by Bug #33420 fixes.
=== modified file 'mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result'
--- a/mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result	2008-12-08 13:31:24 +0000
+++ b/mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result	2008-12-08 19:47:15 +0000
@@ -385,8 +385,6 @@ master-bin.000001	#	Xid	#	#	COMMIT /* XI
 master-bin.000001	#	Query	#	#	use `test`; BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	#	#	table_id: # (test.t2)
-master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Query	#	#	use `test`; COMMIT
 master-bin.000001	#	Query	#	#	use `test`; DROP TABLE t2
 master-bin.000001	#	Query	#	#	use `test`; BEGIN