Commit 0bc31c3e authored by unknown's avatar unknown

MWL#136: Fix test failures for row-based binlogging by fixing binlog format.

parent 7322e388
...@@ -27,6 +27,7 @@ INSERT INTO t2(a, b, c, d) VALUES ('a', 'b', 'c', 'd'); ...@@ -27,6 +27,7 @@ INSERT INTO t2(a, b, c, d) VALUES ('a', 'b', 'c', 'd');
INSERT INTO t2(a, b, c, d) VALUES ('a', 'b', 'c', 'd'); INSERT INTO t2(a, b, c, d) VALUES ('a', 'b', 'c', 'd');
INSERT INTO t2(a, b, c, d) VALUES ('a', 'b', 'c', 'd'); INSERT INTO t2(a, b, c, d) VALUES ('a', 'b', 'c', 'd');
INSERT INTO t2(a, b, c, d) VALUES ('a', 'b', 'c', 'd'); INSERT INTO t2(a, b, c, d) VALUES ('a', 'b', 'c', 'd');
SET binlog_format= mixed;
RESET MASTER; RESET MASTER;
START TRANSACTION; START TRANSACTION;
insert into t1 select * from t2; insert into t1 select * from t2;
...@@ -38,6 +39,7 @@ a b c d id ...@@ -38,6 +39,7 @@ a b c d id
SHOW BINLOG EVENTS LIMIT 2,1; SHOW BINLOG EVENTS LIMIT 2,1;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
delete from t1; delete from t1;
SET binlog_format= mixed;
RESET MASTER; RESET MASTER;
START TRANSACTION; START TRANSACTION;
insert into t1 select * from t2; insert into t1 select * from t2;
...@@ -60,6 +62,7 @@ SHOW BINLOG EVENTS LIMIT 2,1; ...@@ -60,6 +62,7 @@ SHOW BINLOG EVENTS LIMIT 2,1;
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 174 Query 1 268 use `test`; insert into t1 select * from t2 master-bin.000001 174 Query 1 268 use `test`; insert into t1 select * from t2
delete from t1; delete from t1;
SET binlog_format= mixed;
RESET MASTER; RESET MASTER;
START TRANSACTION; START TRANSACTION;
insert into t1 select * from t2; insert into t1 select * from t2;
...@@ -82,6 +85,7 @@ SHOW BINLOG EVENTS LIMIT 2,1; ...@@ -82,6 +85,7 @@ SHOW BINLOG EVENTS LIMIT 2,1;
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 174 Query 1 268 use `test`; insert into t1 select * from t2 master-bin.000001 174 Query 1 268 use `test`; insert into t1 select * from t2
delete from t1; delete from t1;
SET binlog_format= mixed;
RESET MASTER; RESET MASTER;
START TRANSACTION; START TRANSACTION;
insert into t1 select * from t2; insert into t1 select * from t2;
...@@ -104,6 +108,7 @@ SHOW BINLOG EVENTS LIMIT 2,1; ...@@ -104,6 +108,7 @@ SHOW BINLOG EVENTS LIMIT 2,1;
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 174 Query 1 268 use `test`; insert into t1 select * from t2 master-bin.000001 174 Query 1 268 use `test`; insert into t1 select * from t2
delete from t1; delete from t1;
SET binlog_format= mixed;
RESET MASTER; RESET MASTER;
START TRANSACTION; START TRANSACTION;
insert into t1 select * from t2; insert into t1 select * from t2;
......
...@@ -291,6 +291,7 @@ DROP VIEW v1; ...@@ -291,6 +291,7 @@ DROP VIEW v1;
DROP TABLE t1; DROP TABLE t1;
SET GLOBAL storage_engine=@old_engine; SET GLOBAL storage_engine=@old_engine;
# Connection default # Connection default
SET binlog_format= mixed;
RESET MASTER; RESET MASTER;
CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB; CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB;
INSERT INTO t1 VALUES (1),(2); INSERT INTO t1 VALUES (1),(2);
......
...@@ -46,6 +46,7 @@ while ($numinserts) ...@@ -46,6 +46,7 @@ while ($numinserts)
while ($numtests) while ($numtests)
{ {
SET binlog_format= mixed;
RESET MASTER; RESET MASTER;
START TRANSACTION; START TRANSACTION;
......
...@@ -1134,6 +1134,7 @@ connect(c3,127.0.0.1,root,,test,$MASTER_MYPORT,); ...@@ -1134,6 +1134,7 @@ connect(c3,127.0.0.1,root,,test,$MASTER_MYPORT,);
connection default; connection default;
--echo # Connection default --echo # Connection default
SET binlog_format= mixed;
RESET MASTER; RESET MASTER;
CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB; CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB;
INSERT INTO t1 VALUES (1),(2); INSERT INTO t1 VALUES (1),(2);
......
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