summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <jonas@eel.(none)>2005-08-19 07:51:47 +0200
committerunknown <jonas@eel.(none)>2005-08-19 07:51:47 +0200
commit678d97ee9959c9d855aa838b926fc76978223131 (patch)
tree5f4328973b40be0872567ba7b5b43b06ebb681b5
parentbdbe25de9b90ff981e2099878d01a06fef4dac17 (diff)
parentaf1652d561fc28d607fa84f1c56e9fa8fd3b2644 (diff)
downloadmariadb-git-678d97ee9959c9d855aa838b926fc76978223131.tar.gz
Merge eel.(none):/home/jonas/src/mysql-4.1-push
into eel.(none):/home/jonas/src/mysql-4.1 mysql-test/t/ndb_config.test: Auto merged ndb/tools/Makefile.am: Auto merged ndb/tools/ndb_config.cpp: Auto merged
-rw-r--r--mysql-test/t/ndb_config.test1
1 files changed, 0 insertions, 1 deletions
diff --git a/mysql-test/t/ndb_config.test b/mysql-test/t/ndb_config.test
index ab3063af672..66287bf6d29 100644
--- a/mysql-test/t/ndb_config.test
+++ b/mysql-test/t/ndb_config.test
@@ -1,5 +1,4 @@
-- source include/have_ndb.inc
--- source include/ndb_default_cluster.inc
-- source include/not_embedded.inc
--exec $NDB_TOOLS_DIR/ndb_config --no-defaults --query=type,nodeid,host 2> /dev/null