diff --git a/mysql-test/suite/binlog/r/binlog_row_binlog.result b/mysql-test/suite/binlog/r/binlog_row_binlog.result
index 6fcaad010d2..88d403c2f68 100644
--- a/mysql-test/suite/binlog/r/binlog_row_binlog.result
+++ b/mysql-test/suite/binlog/r/binlog_row_binlog.result
@@ -235,6 +235,137 @@ master-bin.000001	#	Rotate	1	#	master-bin.000002;pos=4
 show binlog events in 'master-bin.000002' from 106;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000002	#	Query	1	#	use `test`; drop table t1
+set @ac = @@autocommit;
+set autocommit= 0;
+reset master;
+create table t1(n int) engine=innodb;
+begin;
+insert into t1 values (1);
+insert into t1 values (2);
+insert into t1 values (3);
+commit;
+drop table t1;
+show binlog events from 0;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	4	Format_desc	1	106	Server version, Binlog ver: 4
+master-bin.000001	106	Query	1	205	use `test`; create table t1(n int) engine=innodb
+master-bin.000001	205	Query	1	273	use `test`; BEGIN
+master-bin.000001	273	Table_map	1	312	table_id: # (test.t1)
+master-bin.000001	312	Write_rows	1	346	table_id: # flags: STMT_END_F
+master-bin.000001	346	Table_map	1	385	table_id: # (test.t1)
+master-bin.000001	385	Write_rows	1	419	table_id: # flags: STMT_END_F
+master-bin.000001	419	Table_map	1	458	table_id: # (test.t1)
+master-bin.000001	458	Write_rows	1	492	table_id: # flags: STMT_END_F
+master-bin.000001	492	Xid	1	519	COMMIT /* XID */
+master-bin.000001	519	Query	1	595	use `test`; drop table t1
+set autocommit= 1;
+reset master;
+create table t1(n int) engine=innodb;
+insert into t1 values (1);
+insert into t1 values (2);
+insert into t1 values (3);
+commit;
+drop table t1;
+show binlog events from 0;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	4	Format_desc	1	106	Server version, Binlog ver: 4
+master-bin.000001	106	Query	1	205	use `test`; create table t1(n int) engine=innodb
+master-bin.000001	205	Table_map	1	244	table_id: # (test.t1)
+master-bin.000001	244	Write_rows	1	278	table_id: # flags: STMT_END_F
+master-bin.000001	278	Xid	1	305	COMMIT /* XID */
+master-bin.000001	305	Table_map	1	344	table_id: # (test.t1)
+master-bin.000001	344	Write_rows	1	378	table_id: # flags: STMT_END_F
+master-bin.000001	378	Xid	1	405	COMMIT /* XID */
+master-bin.000001	405	Table_map	1	444	table_id: # (test.t1)
+master-bin.000001	444	Write_rows	1	478	table_id: # flags: STMT_END_F
+master-bin.000001	478	Xid	1	505	COMMIT /* XID */
+master-bin.000001	505	Query	1	581	use `test`; drop table t1
+reset master;
+create table t1(n int) engine=myisam;
+begin;
+insert into t1 values (4);
+insert into t1 values (5);
+insert into t1 values (6);
+commit;
+drop table t1;
+show binlog events from 0;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	4	Format_desc	1	106	Server version, Binlog ver: 4
+master-bin.000001	106	Query	1	205	use `test`; create table t1(n int) engine=myisam
+master-bin.000001	205	Table_map	1	244	table_id: # (test.t1)
+master-bin.000001	244	Write_rows	1	278	table_id: # flags: STMT_END_F
+master-bin.000001	278	Table_map	1	317	table_id: # (test.t1)
+master-bin.000001	317	Write_rows	1	351	table_id: # flags: STMT_END_F
+master-bin.000001	351	Table_map	1	390	table_id: # (test.t1)
+master-bin.000001	390	Write_rows	1	424	table_id: # flags: STMT_END_F
+master-bin.000001	424	Query	1	500	use `test`; drop table t1
+set autocommit= 1;
+reset master;
+create table t1(n int) engine=innodb;
+show master status;
+File	Position	Binlog_Do_DB	Binlog_Ignore_DB
+master-bin.000001	205		
+insert into t1 values (1);
+show master status;
+File	Position	Binlog_Do_DB	Binlog_Ignore_DB
+master-bin.000001	305		
+insert into t1 values (2);
+insert into t1 values (3);
+show master status;
+File	Position	Binlog_Do_DB	Binlog_Ignore_DB
+master-bin.000001	505		
+commit;
+show master status;
+File	Position	Binlog_Do_DB	Binlog_Ignore_DB
+master-bin.000001	505		
+drop table t1;
+show binlog events from 0;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	4	Format_desc	1	106	Server version, Binlog ver: 4
+master-bin.000001	106	Query	1	205	use `test`; create table t1(n int) engine=innodb
+master-bin.000001	205	Table_map	1	244	table_id: # (test.t1)
+master-bin.000001	244	Write_rows	1	278	table_id: # flags: STMT_END_F
+master-bin.000001	278	Xid	1	305	COMMIT /* XID */
+master-bin.000001	305	Table_map	1	344	table_id: # (test.t1)
+master-bin.000001	344	Write_rows	1	378	table_id: # flags: STMT_END_F
+master-bin.000001	378	Xid	1	405	COMMIT /* XID */
+master-bin.000001	405	Table_map	1	444	table_id: # (test.t1)
+master-bin.000001	444	Write_rows	1	478	table_id: # flags: STMT_END_F
+master-bin.000001	478	Xid	1	505	COMMIT /* XID */
+master-bin.000001	505	Query	1	581	use `test`; drop table t1
+set autocommit= 0;
+reset master;
+create table t1(n int) engine=myisam;
+show master status;
+File	Position	Binlog_Do_DB	Binlog_Ignore_DB
+master-bin.000001	205		
+insert into t1 values (4);
+show master status;
+File	Position	Binlog_Do_DB	Binlog_Ignore_DB
+master-bin.000001	278		
+insert into t1 values (5);
+insert into t1 values (6);
+show master status;
+File	Position	Binlog_Do_DB	Binlog_Ignore_DB
+master-bin.000001	424		
+commit;
+show master status;
+File	Position	Binlog_Do_DB	Binlog_Ignore_DB
+master-bin.000001	424		
+drop table t1;
+show binlog events from 0;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	4	Format_desc	1	106	Server version, Binlog ver: 4
+master-bin.000001	106	Query	1	205	use `test`; create table t1(n int) engine=myisam
+master-bin.000001	205	Table_map	1	244	table_id: # (test.t1)
+master-bin.000001	244	Write_rows	1	278	table_id: # flags: STMT_END_F
+master-bin.000001	278	Table_map	1	317	table_id: # (test.t1)
+master-bin.000001	317	Write_rows	1	351	table_id: # flags: STMT_END_F
+master-bin.000001	351	Table_map	1	390	table_id: # (test.t1)
+master-bin.000001	390	Write_rows	1	424	table_id: # flags: STMT_END_F
+master-bin.000001	424	Query	1	500	use `test`; drop table t1
+set session autocommit = @ac;
+End of 5.0 tests
 reset master;
 create table t1 (id tinyint auto_increment primary key);
 set insert_id=128;
diff --git a/mysql-test/suite/rpl/r/rpl_row_create_table.result b/mysql-test/suite/rpl/r/rpl_row_create_table.result
index e76ce5b962d..f22881bd4a9 100644
--- a/mysql-test/suite/rpl/r/rpl_row_create_table.result
+++ b/mysql-test/suite/rpl/r/rpl_row_create_table.result
@@ -279,25 +279,25 @@ Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 #	192	Table_map	#	231	table_id: # (test.t1)
 #	231	Write_rows	#	275	table_id: # flags: STMT_END_F
 #	275	Query	#	343	use `test`; BEGIN
-#	343	Query	#	125	use `test`; CREATE TABLE `t2` (
+#	343	Query	#	468	use `test`; CREATE TABLE `t2` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=InnoDB
-#	468	Table_map	#	164	table_id: # (test.t2)
-#	507	Write_rows	#	208	table_id: # flags: STMT_END_F
+#	468	Table_map	#	507	table_id: # (test.t2)
+#	507	Write_rows	#	551	table_id: # flags: STMT_END_F
 #	551	Xid	#	578	COMMIT /* XID */
 #	578	Query	#	646	use `test`; BEGIN
-#	646	Query	#	125	use `test`; CREATE TABLE `t3` (
+#	646	Query	#	771	use `test`; CREATE TABLE `t3` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=InnoDB
-#	771	Table_map	#	164	table_id: # (test.t3)
-#	810	Write_rows	#	208	table_id: # flags: STMT_END_F
+#	771	Table_map	#	810	table_id: # (test.t3)
+#	810	Write_rows	#	854	table_id: # flags: STMT_END_F
 #	854	Xid	#	881	COMMIT /* XID */
 #	881	Query	#	949	use `test`; BEGIN
-#	949	Query	#	125	use `test`; CREATE TABLE `t4` (
+#	949	Query	#	1074	use `test`; CREATE TABLE `t4` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=InnoDB
-#	1074	Table_map	#	164	table_id: # (test.t4)
-#	1113	Write_rows	#	208	table_id: # flags: STMT_END_F
+#	1074	Table_map	#	1113	table_id: # (test.t4)
+#	1113	Write_rows	#	1157	table_id: # flags: STMT_END_F
 #	1157	Xid	#	1184	COMMIT /* XID */
 #	1184	Table_map	#	1223	table_id: # (test.t1)
 #	1223	Write_rows	#	1267	table_id: # flags: STMT_END_F
@@ -371,10 +371,10 @@ Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 #	231	Write_rows	#	275	table_id: # flags: STMT_END_F
 #	275	Query	#	375	use `test`; CREATE TABLE t2 (a INT) ENGINE=INNODB
 #	375	Query	#	443	use `test`; BEGIN
-#	443	Table_map	#	39	table_id: # (test.t2)
-#	482	Write_rows	#	83	table_id: # flags: STMT_END_F
-#	526	Table_map	#	122	table_id: # (test.t2)
-#	565	Write_rows	#	161	table_id: # flags: STMT_END_F
+#	443	Table_map	#	482	table_id: # (test.t2)
+#	482	Write_rows	#	526	table_id: # flags: STMT_END_F
+#	526	Table_map	#	565	table_id: # (test.t2)
+#	565	Write_rows	#	604	table_id: # flags: STMT_END_F
 #	604	Xid	#	631	COMMIT /* XID */
 SELECT * FROM t2 ORDER BY a;
 a
@@ -396,7 +396,7 @@ SELECT * FROM t2 ORDER BY a;
 a
 SHOW BINLOG EVENTS FROM 631;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-#	631	Query	#	80	use `test`; TRUNCATE TABLE t2
+#	631	Query	#	711	use `test`; TRUNCATE TABLE t2
 #	711	Xid	#	738	COMMIT /* XID */
 SELECT * FROM t2 ORDER BY a;
 a