bk commit into 5.1 tree (tomas:1.2575)

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas.  When tomas does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-03-17 17:01:52+01:00, tomas@stripped +2 -0
  make explicit check for one mysqld

  mysql-test/include/have_one_ndb.inc@stripped, 2008-03-17 17:01:50+01:00, tomas@stripped +21 -0
    New BitKeeper file ``mysql-test/include/have_one_ndb.inc''

  mysql-test/include/have_one_ndb.inc@stripped, 2008-03-17 17:01:50+01:00, tomas@stripped +0 -0

  mysql-test/include/ndb_master-slave.inc@stripped, 2008-03-17 17:01:50+01:00, tomas@stripped +1 -1
    make explicit check for one mysqld

diff -Nrup a/mysql-test/include/have_one_ndb.inc b/mysql-test/include/have_one_ndb.inc
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/include/have_one_ndb.inc	2008-03-17 17:01:50 +01:00
@@ -0,0 +1,21 @@
+# Check that server is compiled and started with support for NDB
+disable_query_log;
+--require r/true.require
+select (support = 'YES' or support = 'DEFAULT') as `TRUE` from information_schema.engines where engine = 'ndbcluster';
+--source include/ndb_not_readonly.inc
+
+# for performance in test suite set temporary
+set global ndb_table_temporary=1;
+set ndb_table_temporary=1;
+
+enable_query_log;
+
+#cleanup
+disable_query_log;
+disable_warnings;
+--error 0,1051
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9,t10;
+flush tables;
+flush status;
+enable_warnings;
+enable_query_log;
diff -Nrup a/mysql-test/include/ndb_master-slave.inc b/mysql-test/include/ndb_master-slave.inc
--- a/mysql-test/include/ndb_master-slave.inc	2008-01-14 22:39:49 +01:00
+++ b/mysql-test/include/ndb_master-slave.inc	2008-03-17 17:01:50 +01:00
@@ -6,7 +6,7 @@ connect (master1,127.0.0.1,root,,test,$M
 
 connect (slave,127.0.0.1,root,,test,$SLAVE_MYPORT,);
 -- connection slave
--- source include/have_ndb.inc
+-- source include/have_one_ndb.inc
 -- source include/ndb_conflict_info_init.inc
 
 connect (slave1,127.0.0.1,root,,test,$SLAVE_MYPORT,);