diff options
| author | unknown <knielsen@knielsen-hq.org> | 2010-11-08 09:11:44 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2010-11-08 09:11:44 +0100 |
| commit | 0bc31c3ef8f2116960d442b03c11544e0c65b468 (patch) | |
| tree | 60bbbf31c85748d0984d75888a8eb48932b0f580 | |
| parent | 7322e38827ce50f86e3facbb63d9c77e744da6df (diff) | |
| download | mariadb-git-0bc31c3ef8f2116960d442b03c11544e0c65b468.tar.gz | |
MWL#136: Fix test failures for row-based binlogging by fixing binlog format.
| -rw-r--r-- | mysql-test/r/group_commit_crash.result | 5 | ||||
| -rw-r--r-- | mysql-test/r/mysqldump-max.result | 1 | ||||
| -rw-r--r-- | mysql-test/t/group_commit_crash.test | 1 | ||||
| -rw-r--r-- | mysql-test/t/mysqldump-max.test | 1 |
4 files changed, 8 insertions, 0 deletions
diff --git a/mysql-test/r/group_commit_crash.result b/mysql-test/r/group_commit_crash.result index 044161695e3..46b6a05a2da 100644 --- a/mysql-test/r/group_commit_crash.result +++ b/mysql-test/r/group_commit_crash.result @@ -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'); +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; diff --git a/mysql-test/r/mysqldump-max.result b/mysql-test/r/mysqldump-max.result index 57c9180691a..d4509b51923 100644 --- a/mysql-test/r/mysqldump-max.result +++ b/mysql-test/r/mysqldump-max.result @@ -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); diff --git a/mysql-test/t/group_commit_crash.test b/mysql-test/t/group_commit_crash.test index 273cd6230eb..b21032d7993 100644 --- a/mysql-test/t/group_commit_crash.test +++ b/mysql-test/t/group_commit_crash.test @@ -46,6 +46,7 @@ while ($numinserts) while ($numtests) { + SET binlog_format= mixed; RESET MASTER; START TRANSACTION; diff --git a/mysql-test/t/mysqldump-max.test b/mysql-test/t/mysqldump-max.test index 0a489b7eac7..27c1a3ce20c 100644 --- a/mysql-test/t/mysqldump-max.test +++ b/mysql-test/t/mysqldump-max.test @@ -1134,6 +1134,7 @@ connect(c3,127.0.0.1,root,,test,$MASTER_MYPORT,); 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); |