bzr commit into mysql-5.1-rep+3 branch (sven.sandberg:3112) Bug#39934

[Sven Sandberg]

#At file:///home/sven/bzr/b39934-mats-slave_row_engine/5.1-rep%2B3/ based on revid:sven.sandberg@stripped

 3112 Sven Sandberg	2009-10-19
      BUG#39934 - post-push fixes.
      The rpl_ndb/combinations file was introduced as part of the fix.
      The file contained an error: ndb suites shall not run with
      binlog_format=mixed. Removed that combination.
     @ mysql-test/suite/rpl_ndb/combinations
        removed binlog_format=statement combination since ndb does not
        support statement format.
     @ mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_tables.test
        Added have_binlog_format_mixed_or_row.inc.

    modified:
      mysql-test/suite/rpl_ndb/combinations
      mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_tables.test
=== modified file 'mysql-test/suite/rpl_ndb/combinations'
--- a/mysql-test/suite/rpl_ndb/combinations	2009-07-14 19:31:19 +0000
+++ b/mysql-test/suite/rpl_ndb/combinations	2009-10-19 08:52:14 +0000
@@ -1,8 +1,5 @@
 [row]
 binlog-format=row
 
-[stmt]
-binlog-format=statement
-
 [mix]
 binlog-format=mixed

=== modified file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_tables.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_tables.test	2009-09-28 11:44:45 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_tables.test	2009-10-19 08:52:14 +0000
@@ -45,6 +45,7 @@
 --source include/have_ndb.inc
 --source include/have_innodb.inc
 --source include/ndb_master-slave.inc
+--source include/have_binlog_format_mixed_or_row.inc
 
 --echo ---- setup master ----
 


Attachment: [text/bzr-bundle] bzr/[e-mail]