Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-target-5.1.22

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-target-5.1.22

mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb2ndb-slave.opt

---default-storage-engine=ndbcluster
+--new --default-storage-engine=ndbcluster

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

mysql-test/suite/rpl_ndb/t/rpl_ndb_myisam2ndb-master.opt

---binlog-format=row

mysql-test/suite/rpl_ndb/t/rpl_ndb_myisam2ndb-slave.opt

---default-storage-engine=ndbcluster
+--new --default-storage-engine=ndbcluster

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