Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint

mysql-test/include/ndb_master-slave.inc

@@ -4,7 +4,12 @@ connect (slave,127.0.0.1,root,,test,$SLAVE_MYPORT,);
 connect (slave1,127.0.0.1,root,,test,$SLAVE_MYPORT,);
 
 connection slave;
--- source include/have_ndb.inc
+# Check that server is compiled and started with support for NDB
+disable_query_log;
+--require r/true.require
+select support = 'Enabled' as `TRUE` from information_schema.engines where engine = 'ndbcluster';
+--source include/ndb_not_readonly.inc
+enable_query_log;
 
 -- source include/master-slave-reset.inc
 

mysql-test/suite/ndb/t/ndb_multi.test

--- source include/have_ndb.inc
 -- source include/have_multi_ndb.inc
 -- source include/not_embedded.inc
 

mysql-test/suite/ndb/t/ndb_multi_row.test

--- source include/have_ndb.inc
 -- source include/have_multi_ndb.inc
 -- source include/not_embedded.inc
 -- source include/have_binlog_format_row.inc