From cdb240ca3f573432c6ab0abc18c8b231720f4b2c Mon Sep 17 00:00:00 2001
From: unknown <kent@mysql.com>
Date: Fri, 5 Aug 2005 19:29:13 +0200
Subject: [PATCH] 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

ndb/tools/ndb_config.cpp:
  Rename: ndb/tools/config.cpp -> ndb/tools/ndb_config.cpp
ndb/tools/Makefile.am:
  config.cpp => ndb_config.cpp, solves link problems on case insensitive OS
client/client_priv.h:
  Removed ending comma in enum
---
 client/client_priv.h                     | 2 +-
 ndb/tools/Makefile.am                    | 2 +-
 ndb/tools/{config.cpp => ndb_config.cpp} | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename ndb/tools/{config.cpp => ndb_config.cpp} (100%)

diff --git a/client/client_priv.h b/client/client_priv.h
index 997f9ffe552..74bc0b41006 100644
--- a/client/client_priv.h
+++ b/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
 };
diff --git a/ndb/tools/Makefile.am b/ndb/tools/Makefile.am
index 0ad8a01b9e2..17b71f7e33c 100644
--- a/ndb/tools/Makefile.am
+++ b/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
diff --git a/ndb/tools/config.cpp b/ndb/tools/ndb_config.cpp
similarity index 100%
rename from ndb/tools/config.cpp
rename to ndb/tools/ndb_config.cpp
-- 
2.30.9