summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <joreland@mysql.com>2005-07-26 08:05:06 +0200
committerunknown <joreland@mysql.com>2005-07-26 08:05:06 +0200
commit43f8b39d0a342304f060c61a082adc668eb84f40 (patch)
tree3be57276cff0ac0f90a784c89c78651504bea538 /mysql-test
parent390af14d5454c95e56a9f402fff09e1a284d487f (diff)
parent702f17ee89d4f36c034381bcc18d374ee6370d86 (diff)
downloadmariadb-git-43f8b39d0a342304f060c61a082adc668eb84f40.tar.gz
Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/t/ndb_config.test3
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/t/ndb_config.test b/mysql-test/t/ndb_config.test
index 27ffdbdcd6e..ea78a32b1ba 100644
--- a/mysql-test/t/ndb_config.test
+++ b/mysql-test/t/ndb_config.test
@@ -1,3 +1,6 @@
+-- source include/have_ndb.inc
+-- source include/not_embedded.inc
+
--exec $NDB_TOOLS_DIR/ndb_config --no-defaults --query=type,nodeid,host 2> /dev/null
--exec $NDB_TOOLS_DIR/ndb_config --no-defaults --query=nodeid,host,DataMemory,IndexMemory --type=ndbd 2> /dev/null
--exec $NDB_TOOLS_DIR/ndb_config --no-defaults -r \\n -f " " --query=nodeid,host,DataMemory,IndexMemory --type=ndbd 2> /dev/null