bzr push into mysql-5.1-telco-7.0 branch (Jonathan.Miller:2898 to 2899) Bug#40586

[Jonathan.Miller]

 2899 Jonathan.Miller@stripped	2009-04-15
      Correcting build break for when RBR is set as default replicaiton format. Original
test was created for Bug#40586, but broke push-build when using ROW. This new version
will except ROW as okay, but will fail if NDB RPL default is set to SBR. In short MBR
&& RBR == Okay, SBR == Failure
      modified:
        mysql-test/suite/rpl_ndb/r/rpl_ndb_check_for_mixed.result
        mysql-test/suite/rpl_ndb/t/rpl_ndb_check_for_mixed.test

 2898 Jonathan.Miller@stripped	2009-04-14 [merge]
      Stuck with merging anyway :-(
      modified:
        storage/ndb/tools/restore/Restore.cpp

=== modified 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	2009-04-14 17:34:54 +0000
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_check_for_mixed.result	2009-04-15 02:35:39 +0000
@@ -4,6 +4,5 @@ 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

=== modified 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	2009-04-14 17:34:54 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_check_for_mixed.test	2009-04-15 02:35:39 +0000
@@ -12,4 +12,10 @@
 --source include/have_log_bin.inc
 --source include/ndb_master-slave.inc
 
+disable_query_log;
+# so that both ROW and MIXED is output as MIXED
+# since both are exceptable valuse for NDB Replication
+-- replace_result ROW MIXED
 show variables like 'binlog_format';
+enable_query_log;
+