From 29c8c152b26398ce7ad84a9794f229b10ad9d410 Mon Sep 17 00:00:00 2001 From: Sven Sandberg Date: Wed, 12 May 2010 12:29:02 +0200 Subject: BUG#50410: rpl_ndb tests should run with binlog_format=row Problem: The rpl_ndb did not set binlog_format explicitly. Since the default is binlog_format=statement, it means that the suite ran with that. ndb does not support binlog_format=statement, and many tests were skipped because they sourced include/have_binlog_format_row_or_mixed.inc Fix: set binlog_format=row explicitly in the configuration file for the rpl_ndb suite. Makefile.am: Removed duplicate run of rpl_ndb suite with binlog_format=row. Now that rpl_ndb is run with binlog_format=row by default, this run that explicitly changes to binlog_format=row is not needed, because it is covered by the following run. mysql-test/suite/rpl_ndb/my.cnf: cluster only supports binlog_format=row. mysql-test/suite/rpl_ndb/r/rpl_ndb_stm_innodb.result: updated result file mysql-test/suite/rpl_ndb/t/rpl_ndb_stm_innodb.test: This test is supposed to use binlog_format=STATEMENT on master. It uses innodb on master, so statement format is supported. --- mysql-test/suite/rpl_ndb/r/rpl_ndb_stm_innodb.result | 1 + 1 file changed, 1 insertion(+) (limited to 'mysql-test/suite/rpl_ndb/r') diff --git a/mysql-test/suite/rpl_ndb/r/rpl_ndb_stm_innodb.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_stm_innodb.result index 675a69d17a4..5327bfde7e0 100644 --- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_stm_innodb.result +++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_stm_innodb.result @@ -4,6 +4,7 @@ reset master; reset slave; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; start slave; +SET binlog_format = STATEMENT; *** Test 1 *** -- cgit v1.2.1 From cf7bac11ecda6899aff0cb5fd66b6002997bce41 Mon Sep 17 00:00:00 2001 From: Alfranio Correia Date: Sun, 16 May 2010 12:45:21 +0100 Subject: BUG#50410: rpl_ndb tests should run with binlog_format=row Post-fix: Updated a test case after the patch for BUG#50410, because the patch makes ndb to run in the row format and as such unsafe warning messages are not printed out. --- .../suite/rpl_ndb/r/rpl_ndb_mixed_engines_transactions.result | 8 -------- 1 file changed, 8 deletions(-) (limited to 'mysql-test/suite/rpl_ndb/r') diff --git a/mysql-test/suite/rpl_ndb/r/rpl_ndb_mixed_engines_transactions.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_mixed_engines_transactions.result index e02c3b23cad..7caa88a16a1 100644 --- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_mixed_engines_transactions.result +++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_mixed_engines_transactions.result @@ -345,27 +345,19 @@ SET AUTOCOMMIT = 1; BEGIN; INSERT INTO tndb VALUES (147); INSERT INTO tinnodb SELECT * FROM tndb ORDER BY a DESC LIMIT 1; -Warnings: -Note 1592 Statement may not be safe to log in statement format. COMMIT; INSERT INTO tndb VALUES (148); BEGIN; INSERT INTO tinnodb SELECT * FROM tndb ORDER BY a DESC LIMIT 1; -Warnings: -Note 1592 Statement may not be safe to log in statement format. INSERT INTO tndb VALUES (149); COMMIT; BEGIN; INSERT INTO tndb VALUES (150); INSERT INTO tmyisam SELECT * FROM tndb ORDER BY a DESC LIMIT 1; -Warnings: -Note 1592 Statement may not be safe to log in statement format. COMMIT; INSERT INTO tndb VALUES (151); BEGIN; INSERT INTO tmyisam SELECT * FROM tndb ORDER BY a DESC LIMIT 1; -Warnings: -Note 1592 Statement may not be safe to log in statement format. INSERT INTO tndb VALUES (152); COMMIT; ==== Verify the result ==== -- cgit v1.2.1