bzr commit into mysql-5.1-telco-7.0 branch (Jonathan.Miller:2893) Bug#40586

[Jonathan.Miller]

#At file:///space/jmiller/clones/7.0-clean/ based on
revid:magnus.blaudd@stripped

 2893 Jonathan.Miller@stripped	2009-04-10
      A real simple test to ensure that "Mixed" stays default replication type for NDB per
Bug#40586
      added:
        mysql-test/suite/rpl_ndb/r/rpl_ndb_check_for_mixed.result
        mysql-test/suite/rpl_ndb/t/rpl_ndb_check_for_mixed.test

=== added file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_check_for_mixed.result'
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_check_for_mixed.result	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_check_for_mixed.result	2009-04-10 20:55:56 +0000
@@ -0,0 +1,9 @@
+stop slave;
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
+reset master;
+reset slave;
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
+start slave;
+show variables like 'binlog_format';
+Variable_name	Value
+binlog_format	MIXED

=== added file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_check_for_mixed.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_check_for_mixed.test	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_check_for_mixed.test	2009-04-10 20:55:56 +0000
@@ -0,0 +1,15 @@
+###########################################################
+# Author: Jeb
+# Date: 2009-04-10
+# Purpose: This is a simple test to ensure that mixed replication
+#          stays default for NDB replication due to Bug#40586.
+#          If this test starts failing, then the default has been
+#          changed and a bug needs to be opened to again
+#          set "MIXED" as default replication for NDB.
+##########################################################
+
+--source include/have_ndb.inc
+--source include/have_log_bin.inc
+--source include/ndb_master-slave.inc
+
+show variables like 'binlog_format';