bzr commit into mysql-5.1-bugteam branch (aelkin:2730) Bug#33420

[Andrei Elkin]

#At file:///home/andrei/MySQL/BZR/FIXES/5.1-bt-bug40221-rbr-stmt-no-stmt-reset/

 2730 Andrei Elkin	2008-12-08
      Bug #33420 Test 'rpl_packet' fails randomly with changed "Exec_Master_Log_Pos"
      
      binlog_row_mix_innodb_myisam resutls are corrected.
      The last operations prior the dup error is
      TRUNCATE table t2;
      Therefore after
      --error ER_DUP_ENTRY
      INSERT INTO t2 select * from t1;
      table t2 must be empty, and that is what the updated results confirm.
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 changed due to Bug #33420 fixing.
=== 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-03 19:55:49 +0000
+++ b/mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result	2008-12-08 19:40:25 +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