repair some rpl_ndb test cases

c45f5bc6 · tomas@whalegate.ndb.mysql.com · 7f429ecc · c45f5bc6 · c45f5bc6 · c45f5bc6
Commit c45f5bc6 authored Aug 27, 2007 by tomas@whalegate.ndb.mysql.com
7 changed files
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_innodb2ndb.result
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_innodb2ndb.result
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_myisam2ndb.result
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_myisam2ndb.result
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb2ndb-slave.opt
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb2ndb-slave.opt
--default-storage-engine=ndbcluster
+--new --default-storage-engine=ndbcluster
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb2ndb.test
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb2ndb.test
@@ -7,8 +7,9 @@
 # to be able to use the same code for all these different
 # test and to have control over the tests.
 ##############################################################
-- source include/have_ndb.inc
 -- source include/have_innodb.inc
+-- source include/have_ndb.inc
+-- source include/have_binlog_format_mixed_or_row.inc
 -- source include/ndb_master-slave.inc
 SET storage_engine=innodb;
 --source extra/rpl_tests/rpl_ndb_2multi_eng.test
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_myisam2ndb-master.opt
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_myisam2ndb-master.opt
--binlog-format=row
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_myisam2ndb-slave.opt
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_myisam2ndb-slave.opt
--default-storage-engine=ndbcluster
+--new --default-storage-engine=ndbcluster
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_myisam2ndb.test
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_myisam2ndb.test
@@ -7,6 +7,8 @@
 # to be able to use the same code for all these different
 # test and to have control over the tests.
 ##############################################################
+-- source include/have_ndb.inc
+-- source include/have_binlog_format_mixed_or_row.inc
 -- source include/ndb_master-slave.inc
 SET storage_engine=myisam;
 --source extra/rpl_tests/rpl_ndb_2multi_eng.test