bk commit into 5.1 tree (tomas:1.2559)

[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, 2007-07-13 14:31:40+02:00, tomas@stripped +1 -0
  avoid some sporadic startup issues

  mysql-test/include/have_ndb.inc@stripped, 2007-07-13 14:31:37+02:00, tomas@stripped +9 -5
    avoid some sporadic startup issues

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	tomas
# Host:	whalegate.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-new-ndb

--- 1.17/mysql-test/include/have_ndb.inc	2007-06-18 15:36:06 +02:00
+++ 1.18/mysql-test/include/have_ndb.inc	2007-07-13 14:31:37 +02:00
@@ -1,6 +1,10 @@
 # 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;
+#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;
+# always make sure we have both mysql servers started ok before test starts
+# there are some initial startup bugs that are avoided by doing this, avoiding sporadic
+# failures in mysql-test-run
+--source include/have_multi_ndb.inc