[Commits] Rev 2865: MWL#136: Fix test failures for row-based binlogging by fixing binlog format. in http://bazaar.launchpad.net/~maria-captains/maria/5.1

knielsen at knielsen-hq.org knielsen at knielsen-hq.org
Mon Nov 8 10:11:44 EET 2010


At http://bazaar.launchpad.net/~maria-captains/maria/5.1

------------------------------------------------------------
revno: 2865
revision-id: knielsen at knielsen-hq.org-20101108081144-73uijsaidpmxtdka
parent: knielsen at knielsen-hq.org-20101107213743-3luszsivft2vt7t6
committer: knielsen at knielsen-hq.org
branch nick: work-5.1-mwl136
timestamp: Mon 2010-11-08 09:11:44 +0100
message:
  MWL#136: Fix test failures for row-based binlogging by fixing binlog format.
=== modified file 'mysql-test/r/group_commit_crash.result'
--- a/mysql-test/r/group_commit_crash.result	2010-11-03 15:54:38 +0000
+++ b/mysql-test/r/group_commit_crash.result	2010-11-08 08:11:44 +0000
@@ -27,6 +27,7 @@ INSERT INTO t2(a, b, c, d) VALUES ('a', 
 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;
 START TRANSACTION;
 insert into t1 select * from t2;
@@ -38,6 +39,7 @@ a	b	c	d	id
 SHOW BINLOG EVENTS LIMIT 2,1;
 Log_name        Pos     Event_type      Server_id       End_log_pos     Info
 delete from t1;
+SET binlog_format= mixed;
 RESET MASTER;
 START TRANSACTION;
 insert into t1 select * from t2;
@@ -60,6 +62,7 @@ SHOW BINLOG EVENTS LIMIT 2,1;
 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
 delete from t1;
+SET binlog_format= mixed;
 RESET MASTER;
 START TRANSACTION;
 insert into t1 select * from t2;
@@ -82,6 +85,7 @@ SHOW BINLOG EVENTS LIMIT 2,1;
 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
 delete from t1;
+SET binlog_format= mixed;
 RESET MASTER;
 START TRANSACTION;
 insert into t1 select * from t2;
@@ -104,6 +108,7 @@ SHOW BINLOG EVENTS LIMIT 2,1;
 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
 delete from t1;
+SET binlog_format= mixed;
 RESET MASTER;
 START TRANSACTION;
 insert into t1 select * from t2;

=== modified file 'mysql-test/r/mysqldump-max.result'
--- a/mysql-test/r/mysqldump-max.result	2010-11-07 21:37:43 +0000
+++ b/mysql-test/r/mysqldump-max.result	2010-11-08 08:11:44 +0000
@@ -291,6 +291,7 @@ DROP VIEW  v1;
 DROP TABLE t1;
 SET GLOBAL storage_engine=@old_engine;
 # Connection default
+SET binlog_format= mixed;
 RESET MASTER;
 CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB;
 INSERT INTO t1 VALUES (1),(2);

=== modified file 'mysql-test/t/group_commit_crash.test'
--- a/mysql-test/t/group_commit_crash.test	2010-11-03 15:54:38 +0000
+++ b/mysql-test/t/group_commit_crash.test	2010-11-08 08:11:44 +0000
@@ -46,6 +46,7 @@ while ($numinserts)
 
 while ($numtests)
 {
+  SET binlog_format= mixed;
   RESET MASTER;
 
   START TRANSACTION;

=== modified file 'mysql-test/t/mysqldump-max.test'
--- a/mysql-test/t/mysqldump-max.test	2010-11-07 21:37:43 +0000
+++ b/mysql-test/t/mysqldump-max.test	2010-11-08 08:11:44 +0000
@@ -1134,6 +1134,7 @@ connect(c3,127.0.0.1,root,,test,$MASTER_
 
 connection default;
 --echo # Connection default
+SET binlog_format= mixed;
 RESET MASTER;
 CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB;
 INSERT INTO t1 VALUES (1),(2);



More information about the commits mailing list