summaryrefslogtreecommitdiff
path: root/storage/ndb/tools/Makefile.am
diff options
context:
space:
mode:
authorunknown <pappa@c-8b0ae253.1238-1-64736c10.cust.bredbandsbolaget.se>2005-08-05 18:45:03 -0400
committerunknown <pappa@c-8b0ae253.1238-1-64736c10.cust.bredbandsbolaget.se>2005-08-05 18:45:03 -0400
commitd6dcd1bfcd1a576772985a2337fcb70c77f74d4b (patch)
treed1739392b7cc886c8c575faa818802c911611f50 /storage/ndb/tools/Makefile.am
parentaca6f88ebb4fb6118b8f12a696111fce167762d3 (diff)
downloadmariadb-git-d6dcd1bfcd1a576772985a2337fcb70c77f74d4b.tar.gz
Fixed ndb_config problems with merge
storage/ndb/tools/ndb_condig.cpp: Rename: ndb/tools/config.cpp -> storage/ndb/tools/ndb_condig.cpp storage/ndb/tools/Makefile.am: Rename due to mixed names with no case sensitivity
Diffstat (limited to 'storage/ndb/tools/Makefile.am')
-rw-r--r--storage/ndb/tools/Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/ndb/tools/Makefile.am b/storage/ndb/tools/Makefile.am
index c99c3721bb0..cb89bcbb9da 100644
--- 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