client_priv.h:

  Removed ending comma in enum
Makefile.am:
  config.cpp => ndb_config.cpp, solves link problems on case insensitive OS
ndb_config.cpp:
  Rename: ndb/tools/config.cpp -> ndb/tools/ndb_config.cpp

client/client_priv.h

@@ -50,5 +50,5 @@ enum options_client
   OPT_NDBCLUSTER, OPT_NDB_CONNECTSTRING,
 #endif
   OPT_TRIGGERS,
-  OPT_IGNORE_TABLE,OPT_INSERT_IGNORE,OPT_SHOW_WARNINGS,OPT_DROP_DATABASE,
+  OPT_IGNORE_TABLE,OPT_INSERT_IGNORE,OPT_SHOW_WARNINGS,OPT_DROP_DATABASE
 };

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_config.cpp \
 	../src/mgmsrv/Config.cpp \
 	../src/mgmsrv/ConfigInfo.cpp \
 	../src/mgmsrv/InitConfigFileParser.cpp