Commit c74c968d authored by unknown's avatar unknown
Browse files

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

Fixing result files for tests.


mysql-test/extra/rpl_tests/rpl_truncate_helper.inc:
  Fixing SERVER_VERSION
mysql-test/r/binlog_row_mix_innodb_myisam.result:
  Result change
mysql-test/r/rpl_ddl.result:
  Result change
mysql-test/r/rpl_row_basic_11bugs.result:
  Result change
mysql-test/r/rpl_truncate_2myisam.result:
  Result change
mysql-test/r/rpl_truncate_3innodb.result:
  Result change
mysql-test/r/rpl_truncate_7ndb.result:
  Result change
mysql-test/t/rpl_truncate_7ndb.test:
  Fixing SERVER_VERSION
parent 5eb8871e

mysql-test/extra/rpl_tests/rpl_truncate_helper.inc

+1 −0
Original line number Diff line number Diff line
@@ -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;

mysql-test/r/binlog_row_mix_innodb_myisam.result

+13 −18
Original line number Diff line number Diff line
@@ -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;

mysql-test/r/rpl_ddl.result

+0 −2
Original line number Diff line number Diff line
@@ -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  ########

mysql-test/r/rpl_row_basic_11bugs.result

+2 −3
Original line number Diff line number Diff line
@@ -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

mysql-test/r/rpl_truncate_2myisam.result

+6 −6
Original line number Diff line number Diff line
@@ -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