Fixed ndb_config problems with merge

db8e0b73 · pappa@c-8b0ae253.1238-1-64736c10.cust.bredbandsbolaget.se · 69acde96 · db8e0b73 · db8e0b73
Commit db8e0b73 authored Aug 05, 2005 by pappa@c-8b0ae253.1238-1-64736c10.cust.bredbandsbolaget.se
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

storage/ndb/tools/Makefile.am storage/ndb/tools/Makefile.am +1 -1

storage/ndb/tools/ndb_condig.cpp storage/ndb/tools/ndb_condig.cpp +0 -0

No files found.
--- a/storage/ndb/tools/Makefile.am
+++ b/storage/ndb/tools/Makefile.am
@@ -33,7 +33,7 @@ ndb_restore_SOURCES = restore/restore_main.cpp \
                      restore/Restore.cpp \
                      ../test/src/NDBT_ResultRow.cpp $(tools_common_sources)

-ndb_config_SOURCES = config.cpp \
+ndb_config_SOURCES = ndb_condig.cpp \
 	../src/mgmsrv/Config.cpp \
 	../src/mgmsrv/ConfigInfo.cpp \
 	../src/mgmsrv/InitConfigFileParser.cpp

--- a/ndb/tools/config.cpp
+++ b/ndb/tools/config.cpp