moved ndb_restore together with rest of the ndb tools

    kernel includes needed by ndb_restore
    changed link order
    moved LocalConfig to mgmapi
    Moved NdbConfig to Portlib
    mgmapi to use LocalConfig for connectstring parsing instead of it's own
    enable usage of "NULL" connectstring for default
    new ndbmgmclient lib that can be used by e.g. mysqladmin later
    LocalConfig no longer needed here, now in mgmapi
    Send connectstring to mgmapi instead
    added valid connectstring to be with only host without port i.e.
    valid connectstring =host1,host2,host3
    default port will be added


ndb/src/common/portlib/NdbConfig.c:
  Rename: ndb/src/common/mgmcommon/NdbConfig.c -> ndb/src/common/portlib/NdbConfig.c
ndb/include/portlib/NdbConfig.h:
  Rename: ndb/include/mgmcommon/NdbConfig.h -> ndb/include/portlib/NdbConfig.h
ndb/include/mgmapi/LocalConfig.hpp:
  Rename: ndb/include/mgmcommon/LocalConfig.hpp -> ndb/include/mgmapi/LocalConfig.hpp
ndb/tools/restore/Makefile.am:
  Rename: ndb/src/kernel/blocks/backup/restore/Makefile.am -> ndb/tools/restore/Makefile.am
ndb/tools/restore/consumer.cpp:
  Rename: ndb/src/kernel/blocks/backup/restore/consumer.cpp -> ndb/tools/restore/consumer.cpp
ndb/tools/restore/consumer.hpp:
  Rename: ndb/src/kernel/blocks/backup/restore/consumer.hpp -> ndb/tools/restore/consumer.hpp
ndb/tools/restore/consumer_printer.hpp:
  Rename: ndb/src/kernel/blocks/backup/restore/consumer_printer.hpp -> ndb/tools/restore/consumer_printer.hpp
ndb/tools/restore/consumer_printer.cpp:
  Rename: ndb/src/kernel/blocks/backup/restore/consumer_printer.cpp -> ndb/tools/restore/consumer_printer.cpp
ndb/tools/restore/consumer_restore.hpp:
  Rename: ndb/src/kernel/blocks/backup/restore/consumer_restore.hpp -> ndb/tools/restore/consumer_restore.hpp
ndb/tools/restore/main.cpp:
  Rename: ndb/src/kernel/blocks/backup/restore/main.cpp -> ndb/tools/restore/main.cpp
ndb/tools/restore/consumer_restorem.cpp:
  Rename: ndb/src/kernel/blocks/backup/restore/consumer_restorem.cpp -> ndb/tools/restore/consumer_restorem.cpp
configure.in:
  moved ndb_restore together with rest of the ndb tools
ndb/config/type_ndbapitools.mk.am:
  kernel includes needed by ndb_restore
ndb/src/Makefile.am:
  changed link order
ndb/src/common/mgmcommon/Makefile.am:
  mived LocalConfig to mgmapi
ndb/src/common/portlib/Makefile.am:
  Moved NdbConfig to Portlib
ndb/src/kernel/blocks/backup/Makefile.am:
  moved restore together with rest of ndb tools
ndb/src/mgmapi/LocalConfig.cpp:
  added valid connectstring to be with only host without port i.e.
  valid connectstring =host1,host2,host3
  default port will be added
ndb/src/mgmapi/Makefile.am:
  LocalConfig part of the libmgmapi
ndb/src/mgmapi/mgmapi.cpp:
  mgmapi to use LocalConfig for connectstring parsing instead of it's own
ndb/src/mgmclient/CommandInterpreter.cpp:
  enable usage of "NULL" connectstring for default
ndb/src/mgmclient/Makefile.am:
  new ndbmgmclient lib that can be used by e.g. mysqladmin later
ndb/src/mgmclient/main.cpp:
  LocalConfig no longer needed here, now in mgmapi
  Send connectstring to mgmapi instead
ndb/tools/Makefile.am:
  add ndb_restore to make of tools
ndb/tools/restore/Restore.cpp:
  moved include BackupFormat and NdbDictionaryImpl to Restore.hpp
ndb/tools/restore/Restore.hpp:
  moved include BackupFormat and NdbDictionaryImpl to Restore.hpp
ndb/tools/restore/consumer_restore.cpp:
  moved include BackupFormat and NdbDictionaryImpl to Restore.hpp
ndb/tools/waiter.cpp:
  LocalConfig moved

2 files changed, 0 insertions, 106 deletions

diff --git a/ndb/include/mgmcommon/LocalConfig.hpp b/ndb/include/mgmcommon/LocalConfig.hpp
deleted file mode 100644
index 9ceeffdba36..00000000000
--- a/ndb/include/mgmcommon/LocalConfig.hpp
+++ /dev/null
@@ -1,67 +0,0 @@
-/* Copyright (C) 2003 MySQL AB
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
-
-#ifndef LocalConfig_H
-#define LocalConfig_H
-
-#include <ndb_global.h>
-#include <NdbOut.hpp>
-
-//****************************************************************************
-// Description: The class LocalConfig corresponds to the information possible
-// to give in the local configuration file.
-//*****************************************************************************
-
-enum MgmtSrvrId_Type {
-  MgmId_TCP  = 0,
-  MgmId_File = 1
-};
-
-struct MgmtSrvrId {
-  MgmtSrvrId_Type type;
-  BaseString name;
-  unsigned int port;
-};
-
-struct LocalConfig {
-
-  int _ownNodeId;
-  Vector<MgmtSrvrId> ids;
-  
-  int error_line;
-  char error_msg[256];
-
-  LocalConfig();
-  ~LocalConfig();
-  bool init(const char *connectString = 0,
-	    const char *fileName = 0);
-
-  void printError() const;
-  void printUsage() const;
-
-  void setError(int lineNumber, const char * _msg);
-  bool readConnectString(const char *, const char *info);
-  bool readFile(const char * file, bool &fopenError);
-  bool parseLine(char * line, int lineNumber);
-  
-  bool parseNodeId(const char *buf);
-  bool parseHostName(const char *buf);
-  bool parseFileName(const char *buf);
-  bool parseString(const char *buf, BaseString &err);
-};
-
-#endif // LocalConfig_H
-
diff --git a/ndb/include/mgmcommon/NdbConfig.h b/ndb/include/mgmcommon/NdbConfig.h
deleted file mode 100644
index 1bca825ab8d..00000000000
--- a/ndb/include/mgmcommon/NdbConfig.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright (C) 2003 MySQL AB
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
-
-#ifndef NDB_CONFIG_H
-#define NDB_CONFIG_H
-
-#ifdef	__cplusplus
-extern "C" {
-#endif
-
-const char* NdbConfig_get_path(int *len);
-void NdbConfig_SetPath(const char *path);
-char* NdbConfig_NdbCfgName(int with_ndb_home);
-char* NdbConfig_ErrorFileName(int node_id);
-char* NdbConfig_ClusterLogFileName(int node_id);
-char* NdbConfig_SignalLogFileName(int node_id);
-char* NdbConfig_TraceFileName(int node_id, int file_no);
-char* NdbConfig_NextTraceFileName(int node_id);
-char* NdbConfig_PidFileName(int node_id);
-char* NdbConfig_StdoutFileName(int node_id);
-
-#ifdef	__cplusplus
-}
-#endif
-
-#endif