Commit b799ea24 authored by svoj@mysql.com/june.mysql.com's avatar svoj@mysql.com/june.mysql.com
Browse files

BUG#34768 - nondeterministic INSERT using LIMIT logged in stmt mode 

            if binlog_format=mixed

Addition to fix for BUG#34768: fixed test case failures discovered
by pushbuild.
parent 3bb915ea

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

+3 −2
Original line number Diff line number Diff line
@@ -10,12 +10,13 @@ execute s using @a; 
prepare s from "insert into t1 select 100 limit ?";

set @a=100;

execute s using @a;

Warnings:

Warning	1592	Statement is not safe to log in statement format.

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)

master-bin.000001	#	User var	#	#	@`a`=98

master-bin.000001	#	Query	#	#	use `test`; insert into t1 values (@a),(98)

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

master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)

master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F

master-bin.000001	#	Query	#	#	use `test`; insert into t1 select 100 limit 100

drop table t1;

mysql-test/suite/binlog/t/binlog_stm_ps.test

+1 −1
Original line number Diff line number Diff line 
# This test is to verify replication with PS



-- source include/not_embedded.inc

-- source include/have_binlog_format_mixed_or_statement.inc

-- source include/have_binlog_format_statement.inc



-- disable_query_log

reset master; # get rid of previous tests binlog

mysql-test/suite/rpl/t/rpl_optimize.test

+2 −0
Original line number Diff line number Diff line
@@ -31,7 +31,9 @@ INSERT INTO t1 (a) SELECT null FROM t1; 
save_master_pos;

# a few updates to force OPTIMIZE to do something

update t1 set b=(a/2*rand());

--disable_warnings

delete from t1 order by b limit 10000;

--enable_warnings



connection slave;

sync_with_master;

mysql-test/suite/rpl/t/rpl_user_variables.test

+2 −0
Original line number Diff line number Diff line
@@ -315,7 +315,9 @@ create table t1(a int); 
insert into t1 values (1),(2);

prepare s1 from 'insert into t1 select a from t1 limit ?';

set @x='1.1';

--disable_warnings

execute s1 using @x;

--enable_warnings

select * from t1;

sync_slave_with_master;

connection slave;