summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <joreland@mysql.com>2005-07-26 08:09:38 +0200
committerunknown <joreland@mysql.com>2005-07-26 08:09:38 +0200
commit185525b684c2c8c95b25aad51acc86cb0db75524 (patch)
tree68101f41eb4aa5315db1a89348dfd8455aabe4dd /mysql-test
parent7eaeaee7cf38d447106a200c558ff714a837663b (diff)
parent43f8b39d0a342304f060c61a082adc668eb84f40 (diff)
downloadmariadb-git-185525b684c2c8c95b25aad51acc86cb0db75524.tar.gz
Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-push
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