Skip to content

M
mariadb
Commit 95b1c019 authored by mats@mysql.com's avatar mats@mysql.com
Browse files
Options

Bug#19066 (DELETE FROM replication inconsistency for NDB): 

Fixing result files for tests.
parent 76473cba
Show whitespace changes
Inline Side-by-side
Showing with 32 additions and 37 deletions
mysql-test/extra/rpl_tests/rpl_truncate_helper.inc
View file @ 95b1c019
...@@ -36,5 +36,6 @@ SELECT * FROM t1; ...@@ -36,5 +36,6 @@ SELECT * FROM t1;
--echo **** On Master **** --echo **** On Master ****
connection master; connection master;
DROP TABLE t1; DROP TABLE t1;
--replace_result $SERVER_VERSION SERVER_VERSION
--replace_regex /table_id: [0-9]+/table_id: #/ --replace_regex /table_id: [0-9]+/table_id: #/
SHOW BINLOG EVENTS; SHOW BINLOG EVENTS;
mysql-test/r/binlog_row_mix_innodb_myisam.result
View file @ 95b1c019
...@@ -265,24 +265,19 @@ master-bin.000001 316 Xid 1 # COMMIT /* xid= */ ...@@ -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 343 Table_map 1 # table_id: # (test.t1)
master-bin.000001 382 Delete_rows 1 # table_id: # flags: STMT_END_F master-bin.000001 382 Delete_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 421 Xid 1 # COMMIT /* xid= */ master-bin.000001 421 Xid 1 # COMMIT /* xid= */
master-bin.000001 448 Table_map 1 # table_id: # (test.t2) master-bin.000001 448 Query 1 # use `test`; alter table t2 engine=MyISAM
master-bin.000001 487 Write_rows 1 # table_id: # flags: STMT_END_F master-bin.000001 539 Table_map 1 # table_id: # (test.t1)
master-bin.000001 516 Xid 1 # COMMIT /* xid= */ master-bin.000001 578 Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 543 Query 1 # use `test`; alter table t2 engine=MyISAM master-bin.000001 612 Xid 1 # COMMIT /* xid= */
master-bin.000001 634 Table_map 1 # table_id: # (test.t1) master-bin.000001 639 Table_map 1 # table_id: # (test.t2)
master-bin.000001 673 Write_rows 1 # table_id: # flags: STMT_END_F master-bin.000001 678 Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 707 Xid 1 # COMMIT /* xid= */ master-bin.000001 712 Query 1 # use `test`; drop table t1,t2
master-bin.000001 734 Query 1 # use `test`; BEGIN master-bin.000001 791 Query 1 # use `test`; create table t0 (n int)
master-bin.000001 802 Table_map 1 # table_id: # (test.t1) master-bin.000001 877 Table_map 1 # table_id: # (test.t0)
master-bin.000001 841 Write_rows 1 # table_id: # flags: STMT_END_F master-bin.000001 916 Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 870 Xid 1 # COMMIT /* xid= */ master-bin.000001 950 Table_map 1 # table_id: # (test.t0)
master-bin.000001 897 Query 1 # use `test`; drop table t1,t2 master-bin.000001 989 Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 976 Query 1 # use `test`; create table t0 (n int) master-bin.000001 1023 Query 1 # use `test`; create table t2 (n int) engine=innodb
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
do release_lock("lock1"); do release_lock("lock1");
drop table t0,t2; drop table t0,t2;
reset master; reset master;
......
mysql-test/r/rpl_ddl.result
View file @ 95b1c019
...@@ -650,11 +650,9 @@ flush logs; ...@@ -650,11 +650,9 @@ flush logs;
-------- switch to master ------- -------- switch to master -------
SELECT * FROM mysqltest1.t7; SELECT * FROM mysqltest1.t7;
f1 f1
-------- switch to slave -------- -------- switch to slave --------
SELECT * FROM mysqltest1.t7; SELECT * FROM mysqltest1.t7;
f1 f1
-------- switch to master ------- -------- switch to master -------
######## LOCK TABLES mysqltest1.t1 WRITE, mysqltest1.t8 READ ######## ######## LOCK TABLES mysqltest1.t1 WRITE, mysqltest1.t8 READ ########
......
mysql-test/r/rpl_row_basic_11bugs.result
View file @ 95b1c019
...@@ -58,6 +58,5 @@ SHOW BINLOG EVENTS; ...@@ -58,6 +58,5 @@ SHOW BINLOG EVENTS;
Log_name Pos Event_type Server_id End_log_pos Info 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 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 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 188 Table_map 1 227 table_id: # (test.t1)
master-bin.000001 265 Table_map 1 304 table_id: # (test.t1) master-bin.000001 227 Write_rows 1 266 table_id: # flags: STMT_END_F
master-bin.000001 304 Write_rows 1 343 table_id: # flags: STMT_END_F
mysql-test/r/rpl_truncate_2myisam.result
View file @ 95b1c019
...@@ -31,7 +31,7 @@ a b ...@@ -31,7 +31,7 @@ a b
DROP TABLE t1; DROP TABLE t1;
SHOW BINLOG EVENTS; SHOW BINLOG EVENTS;
Log_name Pos Event_type Server_id End_log_pos Info 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 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 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 master-bin.000001 307 Query 1 387 use `test`; TRUNCATE TABLE t1
...@@ -63,7 +63,7 @@ a b ...@@ -63,7 +63,7 @@ a b
DROP TABLE t1; DROP TABLE t1;
SHOW BINLOG EVENTS; SHOW BINLOG EVENTS;
Log_name Pos Event_type Server_id End_log_pos Info 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 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 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 master-bin.000001 307 Query 1 387 use `test`; TRUNCATE TABLE t1
...@@ -95,7 +95,7 @@ a b ...@@ -95,7 +95,7 @@ a b
DROP TABLE t1; DROP TABLE t1;
SHOW BINLOG EVENTS; SHOW BINLOG EVENTS;
Log_name Pos Event_type Server_id End_log_pos Info 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 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 210 Table_map 1 250 table_id: # (test.t1)
master-bin.000001 250 Write_rows 1 297 table_id: # flags: STMT_END_F master-bin.000001 250 Write_rows 1 297 table_id: # flags: STMT_END_F
...@@ -128,7 +128,7 @@ a b ...@@ -128,7 +128,7 @@ a b
DROP TABLE t1; DROP TABLE t1;
SHOW BINLOG EVENTS; SHOW BINLOG EVENTS;
Log_name Pos Event_type Server_id End_log_pos Info 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 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 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 master-bin.000001 307 Query 1 384 use `test`; DELETE FROM t1
...@@ -160,7 +160,7 @@ a b ...@@ -160,7 +160,7 @@ a b
DROP TABLE t1; DROP TABLE t1;
SHOW BINLOG EVENTS; SHOW BINLOG EVENTS;
Log_name Pos Event_type Server_id End_log_pos Info 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 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 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 master-bin.000001 307 Query 1 384 use `test`; DELETE FROM t1
...@@ -193,7 +193,7 @@ a b ...@@ -193,7 +193,7 @@ a b
DROP TABLE t1; DROP TABLE t1;
SHOW BINLOG EVENTS; SHOW BINLOG EVENTS;
Log_name Pos Event_type Server_id End_log_pos Info 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 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 210 Table_map 1 250 table_id: # (test.t1)
master-bin.000001 250 Write_rows 1 297 table_id: # flags: STMT_END_F master-bin.000001 250 Write_rows 1 297 table_id: # flags: STMT_END_F
......
mysql-test/r/rpl_truncate_3innodb.result
View file @ 95b1c019
...@@ -31,7 +31,7 @@ a b ...@@ -31,7 +31,7 @@ a b
DROP TABLE t1; DROP TABLE t1;
SHOW BINLOG EVENTS; SHOW BINLOG EVENTS;
Log_name Pos Event_type Server_id End_log_pos Info 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 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 210 Query 1 97 use `test`; INSERT INTO t1 VALUES (1,1), (2,2)
master-bin.000001 307 Xid 1 334 COMMIT /* xid= */ master-bin.000001 307 Xid 1 334 COMMIT /* xid= */
...@@ -65,7 +65,7 @@ a b ...@@ -65,7 +65,7 @@ a b
DROP TABLE t1; DROP TABLE t1;
SHOW BINLOG EVENTS; SHOW BINLOG EVENTS;
Log_name Pos Event_type Server_id End_log_pos Info 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 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 210 Query 1 97 use `test`; INSERT INTO t1 VALUES (1,1), (2,2)
master-bin.000001 307 Xid 1 334 COMMIT /* xid= */ master-bin.000001 307 Xid 1 334 COMMIT /* xid= */
...@@ -99,7 +99,7 @@ a b ...@@ -99,7 +99,7 @@ a b
DROP TABLE t1; DROP TABLE t1;
SHOW BINLOG EVENTS; SHOW BINLOG EVENTS;
Log_name Pos Event_type Server_id End_log_pos Info 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 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 210 Table_map 1 40 table_id: # (test.t1)
master-bin.000001 250 Write_rows 1 87 table_id: # flags: STMT_END_F master-bin.000001 250 Write_rows 1 87 table_id: # flags: STMT_END_F
...@@ -134,7 +134,7 @@ a b ...@@ -134,7 +134,7 @@ a b
DROP TABLE t1; DROP TABLE t1;
SHOW BINLOG EVENTS; SHOW BINLOG EVENTS;
Log_name Pos Event_type Server_id End_log_pos Info 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 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 210 Query 1 97 use `test`; INSERT INTO t1 VALUES (1,1), (2,2)
master-bin.000001 307 Xid 1 334 COMMIT /* xid= */ master-bin.000001 307 Xid 1 334 COMMIT /* xid= */
...@@ -168,7 +168,7 @@ a b ...@@ -168,7 +168,7 @@ a b
DROP TABLE t1; DROP TABLE t1;
SHOW BINLOG EVENTS; SHOW BINLOG EVENTS;
Log_name Pos Event_type Server_id End_log_pos Info 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 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 210 Query 1 97 use `test`; INSERT INTO t1 VALUES (1,1), (2,2)
master-bin.000001 307 Xid 1 334 COMMIT /* xid= */ master-bin.000001 307 Xid 1 334 COMMIT /* xid= */
...@@ -203,7 +203,7 @@ a b ...@@ -203,7 +203,7 @@ a b
DROP TABLE t1; DROP TABLE t1;
SHOW BINLOG EVENTS; SHOW BINLOG EVENTS;
Log_name Pos Event_type Server_id End_log_pos Info 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 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 210 Table_map 1 40 table_id: # (test.t1)
master-bin.000001 250 Write_rows 1 87 table_id: # flags: STMT_END_F master-bin.000001 250 Write_rows 1 87 table_id: # flags: STMT_END_F
......
mysql-test/r/rpl_truncate_7ndb.result
View file @ 95b1c019
...@@ -29,7 +29,7 @@ a b ...@@ -29,7 +29,7 @@ a b
DROP TABLE t1; DROP TABLE t1;
SHOW BINLOG EVENTS; SHOW BINLOG EVENTS;
Log_name Pos Event_type Server_id End_log_pos Info 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 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 219 Query 1 283 BEGIN
master-bin.000001 283 Table_map 1 40 table_id: # (test.t1) master-bin.000001 283 Table_map 1 40 table_id: # (test.t1)
...@@ -72,7 +72,7 @@ a b ...@@ -72,7 +72,7 @@ a b
DROP TABLE t1; DROP TABLE t1;
SHOW BINLOG EVENTS; SHOW BINLOG EVENTS;
Log_name Pos Event_type Server_id End_log_pos Info 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 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 219 Query 1 283 BEGIN
master-bin.000001 283 Table_map 1 40 table_id: # (test.t1) master-bin.000001 283 Table_map 1 40 table_id: # (test.t1)
......
mysql-test/t/rpl_truncate_7ndb.test
View file @ 95b1c019
...@@ -37,6 +37,7 @@ SELECT * FROM t1 ORDER BY a,b; ...@@ -37,6 +37,7 @@ SELECT * FROM t1 ORDER BY a,b;
connection master; connection master;
DROP TABLE t1; DROP TABLE t1;
--replace_regex /table_id: [0-9]+/table_id: #/ --replace_regex /table_id: [0-9]+/table_id: #/
--replace_result $SERVER_VERSION SERVER_VERSION
SHOW BINLOG EVENTS; SHOW BINLOG EVENTS;
--echo **** On Master **** --echo **** On Master ****
...@@ -60,5 +61,6 @@ SELECT * FROM t1 ORDER BY a,b; ...@@ -60,5 +61,6 @@ SELECT * FROM t1 ORDER BY a,b;
connection master; connection master;
DROP TABLE t1; DROP TABLE t1;
--replace_regex /table_id: [0-9]+/table_id: #/ --replace_regex /table_id: [0-9]+/table_id: #/
--replace_result $SERVER_VERSION SERVER_VERSION
SHOW BINLOG EVENTS; SHOW BINLOG EVENTS;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7