Commit ab396c1d authored by sven@riska.(none)'s avatar sven@riska.(none)
Browse files

BUG#26395: if crash during autocommit update to transactional table on master, slave fails 

Now, every transaction (including autocommit transactions) starts with
a BEGIN and ends with a COMMIT/ROLLBACK in the binlog.
Added a test case, and updated lots of test case result files.
parent 45f6c038

mysql-test/r/multi_update.result

+2 −2
Original line number Diff line number Diff line
@@ -627,7 +627,7 @@ a b 
4	4

show master status /* there must be the UPDATE query event */;

File	Position	Binlog_Do_DB	Binlog_Ignore_DB

master-bin.000001	268		

master-bin.000001	336		

delete from t1;

delete from t2;

insert into t1 values (1,2),(3,4),(4,4);
@@ -637,7 +637,7 @@ UPDATE t2,t1 SET t2.a=t2.b where t2.a=t1.a; 
ERROR 23000: Duplicate entry '4' for key 'PRIMARY'

show master status /* there must be the UPDATE query event */;

File	Position	Binlog_Do_DB	Binlog_Ignore_DB

master-bin.000001	283		

master-bin.000001	351		

drop table t1, t2;

set @@session.binlog_format= @sav_binlog_format;

drop table if exists t1, t2, t3;

mysql-test/r/sp_trans_log.result

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ insert into t2 values (bug23333(),1)| 
ERROR 23000: Duplicate entry '1' for key 'PRIMARY'

show binlog events from 106 /* with fixes for #23333 will show there is the query */|

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin.000001	#	Query	1	#	#

master-bin.000001	#	Table_map	1	#	#

master-bin.000001	#	Table_map	1	#	#

master-bin.000001	#	Write_rows	1	#	#

mysql-test/suite/binlog/r/binlog_innodb.result

+1 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ COMMIT; 
show binlog events from <binlog_start>;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1 (a INT PRIMARY KEY, b INT) ENGINE=INNODB

master-bin.000001	#	Query	#	#	use `test`; BEGIN

master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (1,1),(2,2),(3,3),(4,4),(5,5),(6,6)

master-bin.000001	#	Xid	#	#	COMMIT /* XID */

master-bin.000001	#	Query	#	#	use `test`; BEGIN

mysql-test/suite/binlog/r/binlog_multi_engine.result

+8 −0
Original line number Diff line number Diff line
@@ -18,8 +18,12 @@ TRUNCATE t1n; 
show binlog events from <binlog_start>;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1m VALUES (1,1), (1,2), (2,1), (2,2)

master-bin.000001	#	Query	#	#	use `test`; BEGIN

master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1b VALUES (1,1), (1,2), (2,1), (2,2)

master-bin.000001	#	Query	#	#	use `test`; COMMIT

master-bin.000001	#	Query	#	#	use `test`; BEGIN

master-bin.000001	#	Query	#	#	use `test`; UPDATE t1m, t1b SET m = 2, b = 3 WHERE n = c

master-bin.000001	#	Query	#	#	use `test`; COMMIT

master-bin.000001	#	Query	#	#	use `test`; BEGIN

master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1n VALUES (1,1), (1,2), (2,1), (2,2)

master-bin.000001	#	Query	#	#	use `test`; UPDATE t1m, t1n SET m = 2, e = 3 WHERE n = f
@@ -49,8 +53,12 @@ TRUNCATE t1n; 
show binlog events from <binlog_start>;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1m VALUES (1,1), (1,2), (2,1), (2,2)

master-bin.000001	#	Query	#	#	use `test`; BEGIN

master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1b VALUES (1,1), (1,2), (2,1), (2,2)

master-bin.000001	#	Query	#	#	use `test`; COMMIT

master-bin.000001	#	Query	#	#	use `test`; BEGIN

master-bin.000001	#	Query	#	#	use `test`; UPDATE t1m, t1b SET m = 2, b = 3 WHERE n = c

master-bin.000001	#	Query	#	#	use `test`; COMMIT

master-bin.000001	#	Query	#	#	use `test`; TRUNCATE t1m

master-bin.000001	#	Query	#	#	use `test`; TRUNCATE t1b

master-bin.000001	#	Query	#	#	BEGIN

mysql-test/suite/binlog/r/binlog_stm_blackhole.result

+16 −0
Original line number Diff line number Diff line
@@ -108,19 +108,35 @@ show binlog events from <binlog_start>; 
Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin.000001	#	Query	#	#	use `test`; drop table t1,t2

master-bin.000001	#	Query	#	#	use `test`; create table t1 (a int) engine=blackhole

master-bin.000001	#	Query	#	#	use `test`; BEGIN

master-bin.000001	#	Query	#	#	use `test`; delete from t1 where a=10

master-bin.000001	#	Query	#	#	use `test`; COMMIT

master-bin.000001	#	Query	#	#	use `test`; BEGIN

master-bin.000001	#	Query	#	#	use `test`; update t1 set a=11 where a=15

master-bin.000001	#	Query	#	#	use `test`; COMMIT

master-bin.000001	#	Query	#	#	use `test`; BEGIN

master-bin.000001	#	Query	#	#	use `test`; insert into t1 values(1)

master-bin.000001	#	Query	#	#	use `test`; COMMIT

master-bin.000001	#	Query	#	#	use `test`; BEGIN

master-bin.000001	#	Query	#	#	use `test`; insert ignore into t1 values(1)

master-bin.000001	#	Query	#	#	use `test`; COMMIT

master-bin.000001	#	Query	#	#	use `test`; BEGIN

master-bin.000001	#	Query	#	#	use `test`; replace into t1 values(100)

master-bin.000001	#	Query	#	#	use `test`; COMMIT

master-bin.000001	#	Query	#	#	use `test`; create table t2 (a varchar(200)) engine=blackhole

master-bin.000001	#	Query	#	#	use `test`; BEGIN

master-bin.000001	#	Begin_load_query	#	#	;file_id=1;block_len=581

master-bin.000001	#	Execute_load_query	#	#	use `test`; load data infile '../std_data_ln/words.dat' into table t2 ;file_id=1

master-bin.000001	#	Query	#	#	use `test`; COMMIT

master-bin.000001	#	Query	#	#	use `test`; alter table t1 add b int

master-bin.000001	#	Query	#	#	use `test`; alter table t1 drop b

master-bin.000001	#	Query	#	#	use `test`; create table t3 like t1

master-bin.000001	#	Query	#	#	use `test`; BEGIN

master-bin.000001	#	Query	#	#	use `test`; insert into t1 select * from t3

master-bin.000001	#	Query	#	#	use `test`; COMMIT

master-bin.000001	#	Query	#	#	use `test`; BEGIN

master-bin.000001	#	Query	#	#	use `test`; replace into t1 select * from t3

master-bin.000001	#	Query	#	#	use `test`; COMMIT

drop table t1,t2,t3;

CREATE TABLE t1(a INT) ENGINE=BLACKHOLE;

INSERT DELAYED INTO t1 VALUES(1);