diff --git a/mysql-test/r/rpl_row_create_table.result b/mysql-test/r/rpl_row_create_table.result index f314aa39b81..2f6fcc5c5ea 100644 --- a/mysql-test/r/rpl_row_create_table.result +++ b/mysql-test/r/rpl_row_create_table.result @@ -137,11 +137,11 @@ a b 1 2 2 4 3 6 -SHOW BINLOG EVENTS FROM 1256; +SHOW BINLOG EVENTS FROM 1118; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 1256 Query 1 1356 use `test`; CREATE TABLE t7 (a INT, b INT UNIQUE) -master-bin.000001 1356 Table_map 1 1396 table_id: # (test.t7) -master-bin.000001 1396 Write_rows 1 1452 table_id: # flags: STMT_END_F +master-bin.000001 1118 Query 1 1218 use `test`; CREATE TABLE t7 (a INT, b INT UNIQUE) +master-bin.000001 1218 Table_map 1 1258 table_id: # (test.t7) +master-bin.000001 1258 Write_rows 1 1314 table_id: # flags: STMT_END_F SELECT * FROM t7 ORDER BY a,b; a b 1 2 @@ -154,10 +154,10 @@ INSERT INTO t7 SELECT a,b FROM tt4; ROLLBACK; Warnings: Warning 1196 Some non-transactional changed tables couldn't be rolled back -SHOW BINLOG EVENTS FROM 1452; +SHOW BINLOG EVENTS FROM 1314; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 1452 Table_map 1 1492 table_id: # (test.t7) -master-bin.000001 1492 Write_rows 1 1548 table_id: # flags: STMT_END_F +master-bin.000001 1314 Table_map 1 1354 table_id: # (test.t7) +master-bin.000001 1354 Write_rows 1 1410 table_id: # flags: STMT_END_F SELECT * FROM t7 ORDER BY a,b; a b 1 2 @@ -191,10 +191,10 @@ Create Table CREATE TABLE `t9` ( `a` int(11) DEFAULT NULL, `b` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 -SHOW BINLOG EVENTS FROM 1548; +SHOW BINLOG EVENTS FROM 1410; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 1548 Query 1 1634 use `test`; CREATE TABLE t8 LIKE t4 -master-bin.000001 1634 Query 1 1773 use `test`; CREATE TABLE `t9` ( +master-bin.000001 1410 Query 1 1496 use `test`; CREATE TABLE t8 LIKE t4 +master-bin.000001 1496 Query 1 1635 use `test`; CREATE TABLE `t9` ( `a` int(11) DEFAULT NULL, `b` int(11) DEFAULT NULL ) diff --git a/mysql-test/t/rpl_row_create_table.test b/mysql-test/t/rpl_row_create_table.test index 8a8ea01d688..a42089441d2 100644 --- a/mysql-test/t/rpl_row_create_table.test +++ b/mysql-test/t/rpl_row_create_table.test @@ -76,7 +76,7 @@ INSERT INTO t7 SELECT a,b FROM tt3; SELECT * FROM t7 ORDER BY a,b; # Should be written to the binary log --replace_regex /table_id: [0-9]+/table_id: #/ -SHOW BINLOG EVENTS FROM 1256; +SHOW BINLOG EVENTS FROM 1118; sync_slave_with_master; SELECT * FROM t7 ORDER BY a,b; @@ -87,7 +87,7 @@ BEGIN; INSERT INTO t7 SELECT a,b FROM tt4; ROLLBACK; --replace_regex /table_id: [0-9]+/table_id: #/ -SHOW BINLOG EVENTS FROM 1452; +SHOW BINLOG EVENTS FROM 1314; SELECT * FROM t7 ORDER BY a,b; sync_slave_with_master; SELECT * FROM t7 ORDER BY a,b; @@ -101,7 +101,7 @@ CREATE TEMPORARY TABLE tt6 LIKE tt4; --query_vertical SHOW CREATE TABLE t8 --query_vertical SHOW CREATE TABLE t9 --replace_regex /table_id: [0-9]+/table_id: #/ -SHOW BINLOG EVENTS FROM 1548; +SHOW BINLOG EVENTS FROM 1410; sync_slave_with_master; --echo **** On Slave **** --query_vertical SHOW CREATE TABLE t8