Commit 7a05a4f5 authored by Georgi Kodinov's avatar Georgi Kodinov
Browse files

Bug #39812: Make statement replication default for 5.1 (to match 5.0) 

Make STMT replication default for 5.1.
Add a default of MIXED into the config files
Fix the tests that needed MIXED replication mode.
parent 0be194e5

mysql-test/include/mix1.inc

+1 −0
Original line number Diff line number Diff line
@@ -1256,6 +1256,7 @@ connect (con1,localhost,root,,); 
connect (con2,localhost,root,,);

SET SESSION AUTOCOMMIT = 0;

SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED;

set binlog_format=mixed;

--echo # Switch to connection con1

connection con1;

mysql-test/r/innodb-semi-consistent.result

+2 −0
Original line number Diff line number Diff line 
drop table if exists t1;

set binlog_format=mixed;

set session transaction isolation level read committed;

create table t1(a int not null) engine=innodb DEFAULT CHARSET=latin1;

insert into t1 values (1),(2),(3),(4),(5),(6),(7);
@@ -6,6 +7,7 @@ set autocommit=0; 
select * from t1 where a=3 lock in share mode;

a

3

set binlog_format=mixed;

set session transaction isolation level read committed;

set autocommit=0;

update t1 set a=10 where a=5;

mysql-test/r/innodb.result

+17 −0
Original line number Diff line number Diff line
@@ -1024,6 +1024,7 @@ id code name 
4	2	Erik

5	3	Sasha

COMMIT;

SET binlog_format='MIXED';

BEGIN;

SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;

insert into t1 (code, name) values (3, 'Jeremy'), (4, 'Matt');
@@ -2961,9 +2962,11 @@ drop table t1,t2; 
create table t1(a int not null, b int, primary key(a)) engine=innodb;

insert into t1 values(1,1),(2,2),(3,1),(4,2),(5,1),(6,2),(7,3);

commit;

SET binlog_format='MIXED';

set autocommit = 0;

SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED;

update t1 set b = 5 where b = 1;

SET binlog_format='MIXED';

set autocommit = 0;

SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED;

select * from t1 where a = 7 and b = 3 for update;
@@ -3002,6 +3005,7 @@ d e 
3	1

8	6

12	1

SET binlog_format='MIXED';

set autocommit = 0;

SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED;

insert into t1 select * from t2;
@@ -3032,30 +3036,39 @@ a b 
3	1

8	6

12	1

SET binlog_format='MIXED';

set autocommit = 0;

SET SESSION TRANSACTION ISOLATION LEVEL SERIALIZABLE;

insert into t1 select * from t2;

SET binlog_format='MIXED';

set autocommit = 0;

SET SESSION TRANSACTION ISOLATION LEVEL SERIALIZABLE;

update t3 set b = (select b from t2 where a = d);

SET binlog_format='MIXED';

set autocommit = 0;

SET SESSION TRANSACTION ISOLATION LEVEL SERIALIZABLE;

create table t4(a int not null, b int, primary key(a)) engine=innodb select * from t2;

SET binlog_format='MIXED';

set autocommit = 0;

SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED;

insert into t5 (select * from t2 lock in share mode);

SET binlog_format='MIXED';

set autocommit = 0;

SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED;

update t6 set e = (select b from t2 where a = d lock in share mode);

SET binlog_format='MIXED';

set autocommit = 0;

SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED;

create table t7(a int not null, b int, primary key(a)) engine=innodb select * from t2 lock in share mode;

SET binlog_format='MIXED';

set autocommit = 0;

SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED;

insert into t8 (select * from t2 for update);

SET binlog_format='MIXED';

set autocommit = 0;

SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED;

update t9 set e = (select b from t2 where a = d for update);

SET binlog_format='MIXED';

set autocommit = 0;

SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED;

create table t10(a int not null, b int, primary key(a)) engine=innodb select * from t2 for update;
@@ -3202,6 +3215,7 @@ id 
-10

1

DROP TABLE t1;

SET binlog_format='MIXED';

SET TX_ISOLATION='read-committed';

SET AUTOCOMMIT=0;

DROP TABLE IF EXISTS t1, t2;
@@ -3212,6 +3226,7 @@ CREATE TABLE t1 ( a int ) ENGINE=InnoDB; 
CREATE TABLE t2 LIKE t1;

SELECT * FROM t2;

a

SET binlog_format='MIXED';

SET TX_ISOLATION='read-committed';

SET AUTOCOMMIT=0;

INSERT INTO t1 VALUES (1);
@@ -3219,10 +3234,12 @@ COMMIT; 
SELECT * FROM t1 WHERE a=1;

a

1

SET binlog_format='MIXED';

SET TX_ISOLATION='read-committed';

SET AUTOCOMMIT=0;

SELECT * FROM t2;

a

SET binlog_format='MIXED';

SET TX_ISOLATION='read-committed';

SET AUTOCOMMIT=0;

INSERT INTO t1 VALUES (2);

mysql-test/r/innodb_mysql.result

+1 −0
Original line number Diff line number Diff line
@@ -1512,6 +1512,7 @@ ok 
drop table t1;

SET SESSION AUTOCOMMIT = 0;

SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED;

set binlog_format=mixed;

# Switch to connection con1

CREATE TABLE t1 (a INT PRIMARY KEY, b VARCHAR(256))

ENGINE = InnoDB;

mysql-test/r/tx_isolation_func.result

+2 −0
Original line number Diff line number Diff line
@@ -21,8 +21,10 @@ INSERT INTO t1 VALUES(24, 24); 
'#----------------------------FN_DYNVARS_184_01--------------------------------------#'

** Connection con0 **

SET SESSION tx_isolation = 'READ-UNCOMMITTED';

set binlog_format=mixed;

** Connection con1 **

SET SESSION tx_isolation = 'READ-UNCOMMITTED';

set binlog_format=mixed;

** Connection con0 **

START TRANSACTION;

SELECT * FROM t1 WHERE a IN (2,4,6,8) FOR UPDATE;