From 00455bd91c3ac089b7a4465118bf57f5ac62a62b Mon Sep 17 00:00:00 2001
From: unknown <jonas@eel.(none)>
Date: Mon, 22 Aug 2005 11:34:33 +0200
Subject: [PATCH] ndb - Fix merge error

mysql-test/t/ndb_config.test:
  Fix merge error
---
 mysql-test/t/ndb_config.test | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mysql-test/t/ndb_config.test b/mysql-test/t/ndb_config.test
index 66287bf6d29..ab3063af672 100644
--- a/mysql-test/t/ndb_config.test
+++ b/mysql-test/t/ndb_config.test
@@ -1,4 +1,5 @@
 -- 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