summaryrefslogtreecommitdiff
path: root/mysql-test/include/have_ndb.inc
diff options
context:
space:
mode:
authorunknown <tomas@whalegate.ndb.mysql.com>2007-07-13 14:31:40 +0200
committerunknown <tomas@whalegate.ndb.mysql.com>2007-07-13 14:31:40 +0200
commitfe6d5d631d52f28188f1c45dda661cad54e95c41 (patch)
treea8417cc1e024476c7c35f785f417a9d201ff96b7 /mysql-test/include/have_ndb.inc
parent49bb7e206b2b04f36f461b59ce7e86d692c7b654 (diff)
downloadmariadb-git-fe6d5d631d52f28188f1c45dda661cad54e95c41.tar.gz
avoid some sporadic startup issues
Diffstat (limited to 'mysql-test/include/have_ndb.inc')
-rw-r--r--mysql-test/include/have_ndb.inc14
1 files changed, 9 insertions, 5 deletions
diff --git a/mysql-test/include/have_ndb.inc b/mysql-test/include/have_ndb.inc
index cb2f2f7cd9e..d087a45a15a 100644
--- a/mysql-test/include/have_ndb.inc
+++ b/mysql-test/include/have_ndb.inc
@@ -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