diff --git a/mysql-test/extra/rpl_tests/rpl_truncate_helper.inc b/mysql-test/extra/rpl_tests/rpl_truncate_helper.inc index c6defefa986b20511b01a73e32c0c59ed7f4cf1c..2306b746a8602c51de3720b4c02a7d4939913aee 100644 --- a/mysql-test/extra/rpl_tests/rpl_truncate_helper.inc +++ b/mysql-test/extra/rpl_tests/rpl_truncate_helper.inc @@ -36,5 +36,6 @@ SELECT * FROM t1; --echo **** On Master **** connection master; DROP TABLE t1; +--replace_result $SERVER_VERSION SERVER_VERSION --replace_regex /table_id: [0-9]+/table_id: #/ SHOW BINLOG EVENTS; diff --git a/mysql-test/r/binlog_row_mix_innodb_myisam.result b/mysql-test/r/binlog_row_mix_innodb_myisam.result index d136c71064211087a0e68f2fba4f034d9332c57d..700bf1c9edc31bf0ba1dee925f4a1d0cecbea58b 100644 --- a/mysql-test/r/binlog_row_mix_innodb_myisam.result +++ b/mysql-test/r/binlog_row_mix_innodb_myisam.result @@ -265,24 +265,19 @@ master-bin.000001 316 Xid 1 # COMMIT /* xid= */ master-bin.000001 343 Table_map 1 # table_id: # (test.t1) master-bin.000001 382 Delete_rows 1 # table_id: # flags: STMT_END_F master-bin.000001 421 Xid 1 # COMMIT /* xid= */ -master-bin.000001 448 Table_map 1 # table_id: # (test.t2) -master-bin.000001 487 Write_rows 1 # table_id: # flags: STMT_END_F -master-bin.000001 516 Xid 1 # COMMIT /* xid= */ -master-bin.000001 543 Query 1 # use `test`; alter table t2 engine=MyISAM -master-bin.000001 634 Table_map 1 # table_id: # (test.t1) -master-bin.000001 673 Write_rows 1 # table_id: # flags: STMT_END_F -master-bin.000001 707 Xid 1 # COMMIT /* xid= */ -master-bin.000001 734 Query 1 # use `test`; BEGIN -master-bin.000001 802 Table_map 1 # table_id: # (test.t1) -master-bin.000001 841 Write_rows 1 # table_id: # flags: STMT_END_F -master-bin.000001 870 Xid 1 # COMMIT /* xid= */ -master-bin.000001 897 Query 1 # use `test`; drop table t1,t2 -master-bin.000001 976 Query 1 # use `test`; create table t0 (n int) -master-bin.000001 1062 Table_map 1 # table_id: # (test.t0) -master-bin.000001 1101 Write_rows 1 # table_id: # flags: STMT_END_F -master-bin.000001 1135 Table_map 1 # table_id: # (test.t0) -master-bin.000001 1174 Write_rows 1 # table_id: # flags: STMT_END_F -master-bin.000001 1208 Query 1 # use `test`; create table t2 (n int) engine=innodb +master-bin.000001 448 Query 1 # use `test`; alter table t2 engine=MyISAM +master-bin.000001 539 Table_map 1 # table_id: # (test.t1) +master-bin.000001 578 Write_rows 1 # table_id: # flags: STMT_END_F +master-bin.000001 612 Xid 1 # COMMIT /* xid= */ +master-bin.000001 639 Table_map 1 # table_id: # (test.t2) +master-bin.000001 678 Write_rows 1 # table_id: # flags: STMT_END_F +master-bin.000001 712 Query 1 # use `test`; drop table t1,t2 +master-bin.000001 791 Query 1 # use `test`; create table t0 (n int) +master-bin.000001 877 Table_map 1 # table_id: # (test.t0) +master-bin.000001 916 Write_rows 1 # table_id: # flags: STMT_END_F +master-bin.000001 950 Table_map 1 # table_id: # (test.t0) +master-bin.000001 989 Write_rows 1 # table_id: # flags: STMT_END_F +master-bin.000001 1023 Query 1 # use `test`; create table t2 (n int) engine=innodb do release_lock("lock1"); drop table t0,t2; reset master; diff --git a/mysql-test/r/rpl_ddl.result b/mysql-test/r/rpl_ddl.result index e828f2c1e3116557732f517c5e89c5d645a5d15f..ec6d718318624db7050d4d7d79fff9744cb7e58e 100644 --- a/mysql-test/r/rpl_ddl.result +++ b/mysql-test/r/rpl_ddl.result @@ -650,11 +650,9 @@ flush logs; -------- switch to master ------- SELECT * FROM mysqltest1.t7; f1 - -------- switch to slave -------- SELECT * FROM mysqltest1.t7; f1 - -------- switch to master ------- ######## LOCK TABLES mysqltest1.t1 WRITE, mysqltest1.t8 READ ######## diff --git a/mysql-test/r/rpl_row_basic_11bugs.result b/mysql-test/r/rpl_row_basic_11bugs.result index 7cd895f20411aec4dc7292e6c5af3c8910cbb5af..8c8a77b5084213d1a52b847f95980e1e81050185 100644 --- a/mysql-test/r/rpl_row_basic_11bugs.result +++ b/mysql-test/r/rpl_row_basic_11bugs.result @@ -58,6 +58,5 @@ SHOW BINLOG EVENTS; Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 4 Format_desc 1 102 Server ver: 5.1.11-beta-debug-log, Binlog ver: 4 master-bin.000001 102 Query 1 188 use `test`; CREATE TABLE t1 (a INT) -master-bin.000001 188 Query 1 265 use `test`; DELETE FROM t1 -master-bin.000001 265 Table_map 1 304 table_id: # (test.t1) -master-bin.000001 304 Write_rows 1 343 table_id: # flags: STMT_END_F +master-bin.000001 188 Table_map 1 227 table_id: # (test.t1) +master-bin.000001 227 Write_rows 1 266 table_id: # flags: STMT_END_F diff --git a/mysql-test/r/rpl_truncate_2myisam.result b/mysql-test/r/rpl_truncate_2myisam.result index 6cd8b267578ce575ea4ab606b478a85ef21d1508..41640a709b9ac92ca0501f6ece382c9b332fdca2 100644 --- a/mysql-test/r/rpl_truncate_2myisam.result +++ b/mysql-test/r/rpl_truncate_2myisam.result @@ -31,7 +31,7 @@ a b DROP TABLE t1; SHOW BINLOG EVENTS; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 4 Format_desc 1 102 Server ver: 5.1.10-beta-debug-log, Binlog ver: 4 +master-bin.000001 4 Format_desc 1 102 Server ver: SERVER_VERSION, Binlog ver: 4 master-bin.000001 102 Query 1 210 use `test`; CREATE TABLE t1 (a INT, b LONG) ENGINE=MyISAM master-bin.000001 210 Query 1 307 use `test`; INSERT INTO t1 VALUES (1,1), (2,2) master-bin.000001 307 Query 1 387 use `test`; TRUNCATE TABLE t1 @@ -63,7 +63,7 @@ a b DROP TABLE t1; SHOW BINLOG EVENTS; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 4 Format_desc 1 102 Server ver: 5.1.10-beta-debug-log, Binlog ver: 4 +master-bin.000001 4 Format_desc 1 102 Server ver: SERVER_VERSION, Binlog ver: 4 master-bin.000001 102 Query 1 210 use `test`; CREATE TABLE t1 (a INT, b LONG) ENGINE=MyISAM master-bin.000001 210 Query 1 307 use `test`; INSERT INTO t1 VALUES (1,1), (2,2) master-bin.000001 307 Query 1 387 use `test`; TRUNCATE TABLE t1 @@ -95,7 +95,7 @@ a b DROP TABLE t1; SHOW BINLOG EVENTS; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 4 Format_desc 1 102 Server ver: 5.1.10-beta-debug-log, Binlog ver: 4 +master-bin.000001 4 Format_desc 1 102 Server ver: SERVER_VERSION, Binlog ver: 4 master-bin.000001 102 Query 1 210 use `test`; CREATE TABLE t1 (a INT, b LONG) ENGINE=MyISAM master-bin.000001 210 Table_map 1 250 table_id: # (test.t1) master-bin.000001 250 Write_rows 1 297 table_id: # flags: STMT_END_F @@ -128,7 +128,7 @@ a b DROP TABLE t1; SHOW BINLOG EVENTS; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 4 Format_desc 1 102 Server ver: 5.1.10-beta-debug-log, Binlog ver: 4 +master-bin.000001 4 Format_desc 1 102 Server ver: SERVER_VERSION, Binlog ver: 4 master-bin.000001 102 Query 1 210 use `test`; CREATE TABLE t1 (a INT, b LONG) ENGINE=MyISAM master-bin.000001 210 Query 1 307 use `test`; INSERT INTO t1 VALUES (1,1), (2,2) master-bin.000001 307 Query 1 384 use `test`; DELETE FROM t1 @@ -160,7 +160,7 @@ a b DROP TABLE t1; SHOW BINLOG EVENTS; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 4 Format_desc 1 102 Server ver: 5.1.10-beta-debug-log, Binlog ver: 4 +master-bin.000001 4 Format_desc 1 102 Server ver: SERVER_VERSION, Binlog ver: 4 master-bin.000001 102 Query 1 210 use `test`; CREATE TABLE t1 (a INT, b LONG) ENGINE=MyISAM master-bin.000001 210 Query 1 307 use `test`; INSERT INTO t1 VALUES (1,1), (2,2) master-bin.000001 307 Query 1 384 use `test`; DELETE FROM t1 @@ -193,7 +193,7 @@ a b DROP TABLE t1; SHOW BINLOG EVENTS; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 4 Format_desc 1 102 Server ver: 5.1.10-beta-debug-log, Binlog ver: 4 +master-bin.000001 4 Format_desc 1 102 Server ver: SERVER_VERSION, Binlog ver: 4 master-bin.000001 102 Query 1 210 use `test`; CREATE TABLE t1 (a INT, b LONG) ENGINE=MyISAM master-bin.000001 210 Table_map 1 250 table_id: # (test.t1) master-bin.000001 250 Write_rows 1 297 table_id: # flags: STMT_END_F diff --git a/mysql-test/r/rpl_truncate_3innodb.result b/mysql-test/r/rpl_truncate_3innodb.result index 8d5fbed07954c802aad0f8758be83c01767c8517..062c9704ae06a46b40702b8996e353209efb7eab 100644 --- a/mysql-test/r/rpl_truncate_3innodb.result +++ b/mysql-test/r/rpl_truncate_3innodb.result @@ -31,7 +31,7 @@ a b DROP TABLE t1; SHOW BINLOG EVENTS; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 4 Format_desc 1 102 Server ver: 5.1.10-beta-debug-log, Binlog ver: 4 +master-bin.000001 4 Format_desc 1 102 Server ver: SERVER_VERSION, Binlog ver: 4 master-bin.000001 102 Query 1 210 use `test`; CREATE TABLE t1 (a INT, b LONG) ENGINE=InnoDB master-bin.000001 210 Query 1 97 use `test`; INSERT INTO t1 VALUES (1,1), (2,2) master-bin.000001 307 Xid 1 334 COMMIT /* xid= */ @@ -65,7 +65,7 @@ a b DROP TABLE t1; SHOW BINLOG EVENTS; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 4 Format_desc 1 102 Server ver: 5.1.10-beta-debug-log, Binlog ver: 4 +master-bin.000001 4 Format_desc 1 102 Server ver: SERVER_VERSION, Binlog ver: 4 master-bin.000001 102 Query 1 210 use `test`; CREATE TABLE t1 (a INT, b LONG) ENGINE=InnoDB master-bin.000001 210 Query 1 97 use `test`; INSERT INTO t1 VALUES (1,1), (2,2) master-bin.000001 307 Xid 1 334 COMMIT /* xid= */ @@ -99,7 +99,7 @@ a b DROP TABLE t1; SHOW BINLOG EVENTS; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 4 Format_desc 1 102 Server ver: 5.1.10-beta-debug-log, Binlog ver: 4 +master-bin.000001 4 Format_desc 1 102 Server ver: SERVER_VERSION, Binlog ver: 4 master-bin.000001 102 Query 1 210 use `test`; CREATE TABLE t1 (a INT, b LONG) ENGINE=InnoDB master-bin.000001 210 Table_map 1 40 table_id: # (test.t1) master-bin.000001 250 Write_rows 1 87 table_id: # flags: STMT_END_F @@ -134,7 +134,7 @@ a b DROP TABLE t1; SHOW BINLOG EVENTS; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 4 Format_desc 1 102 Server ver: 5.1.10-beta-debug-log, Binlog ver: 4 +master-bin.000001 4 Format_desc 1 102 Server ver: SERVER_VERSION, Binlog ver: 4 master-bin.000001 102 Query 1 210 use `test`; CREATE TABLE t1 (a INT, b LONG) ENGINE=InnoDB master-bin.000001 210 Query 1 97 use `test`; INSERT INTO t1 VALUES (1,1), (2,2) master-bin.000001 307 Xid 1 334 COMMIT /* xid= */ @@ -168,7 +168,7 @@ a b DROP TABLE t1; SHOW BINLOG EVENTS; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 4 Format_desc 1 102 Server ver: 5.1.10-beta-debug-log, Binlog ver: 4 +master-bin.000001 4 Format_desc 1 102 Server ver: SERVER_VERSION, Binlog ver: 4 master-bin.000001 102 Query 1 210 use `test`; CREATE TABLE t1 (a INT, b LONG) ENGINE=InnoDB master-bin.000001 210 Query 1 97 use `test`; INSERT INTO t1 VALUES (1,1), (2,2) master-bin.000001 307 Xid 1 334 COMMIT /* xid= */ @@ -203,7 +203,7 @@ a b DROP TABLE t1; SHOW BINLOG EVENTS; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 4 Format_desc 1 102 Server ver: 5.1.10-beta-debug-log, Binlog ver: 4 +master-bin.000001 4 Format_desc 1 102 Server ver: SERVER_VERSION, Binlog ver: 4 master-bin.000001 102 Query 1 210 use `test`; CREATE TABLE t1 (a INT, b LONG) ENGINE=InnoDB master-bin.000001 210 Table_map 1 40 table_id: # (test.t1) master-bin.000001 250 Write_rows 1 87 table_id: # flags: STMT_END_F diff --git a/mysql-test/r/rpl_truncate_7ndb.result b/mysql-test/r/rpl_truncate_7ndb.result index 40ca6409759ca135ce7362241201f54280d1764b..b33f8f1ccaa465a52f5ec7b9984c14d840535aee 100644 --- a/mysql-test/r/rpl_truncate_7ndb.result +++ b/mysql-test/r/rpl_truncate_7ndb.result @@ -29,7 +29,7 @@ a b DROP TABLE t1; SHOW BINLOG EVENTS; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 4 Format_desc 1 102 Server ver: 5.1.10-beta-debug-log, Binlog ver: 4 +master-bin.000001 4 Format_desc 1 102 Server ver: SERVER_VERSION, Binlog ver: 4 master-bin.000001 102 Query 1 219 use `test`; CREATE TABLE t1 (a INT PRIMARY KEY, b LONG) ENGINE=NDB master-bin.000001 219 Query 1 283 BEGIN master-bin.000001 283 Table_map 1 40 table_id: # (test.t1) @@ -72,7 +72,7 @@ a b DROP TABLE t1; SHOW BINLOG EVENTS; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 4 Format_desc 1 102 Server ver: 5.1.10-beta-debug-log, Binlog ver: 4 +master-bin.000001 4 Format_desc 1 102 Server ver: SERVER_VERSION, Binlog ver: 4 master-bin.000001 102 Query 1 219 use `test`; CREATE TABLE t1 (a INT PRIMARY KEY, b LONG) ENGINE=NDB master-bin.000001 219 Query 1 283 BEGIN master-bin.000001 283 Table_map 1 40 table_id: # (test.t1) diff --git a/mysql-test/t/rpl_truncate_7ndb.test b/mysql-test/t/rpl_truncate_7ndb.test index 7a8101cbf551af655a0bdde3b3563bf4978e1887..7a6151c6028c21e9132fc39da63471a9d0527b7d 100644 --- a/mysql-test/t/rpl_truncate_7ndb.test +++ b/mysql-test/t/rpl_truncate_7ndb.test @@ -37,6 +37,7 @@ SELECT * FROM t1 ORDER BY a,b; connection master; DROP TABLE t1; --replace_regex /table_id: [0-9]+/table_id: #/ +--replace_result $SERVER_VERSION SERVER_VERSION SHOW BINLOG EVENTS; --echo **** On Master **** @@ -60,5 +61,6 @@ SELECT * FROM t1 ORDER BY a,b; connection master; DROP TABLE t1; --replace_regex /table_id: [0-9]+/table_id: #/ +--replace_result $SERVER_VERSION SERVER_VERSION SHOW BINLOG EVENTS;