merge

BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
ndb/include/Makefile.am:
  Auto merged
ndb/include/kernel/LogLevel.hpp:
  Auto merged
ndb/include/mgmapi/mgmapi.h:
  Auto merged
ndb/include/ndbapi/NdbConnection.hpp:
  Auto merged
ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
ndb/src/common/debugger/EventLogger.cpp:
  Auto merged
ndb/src/common/logger/FileLogHandler.cpp:
  Auto merged
ndb/src/common/logger/Logger.cpp:
  Auto merged
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  Auto merged
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/main.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
  Auto merged
ndb/src/kernel/vm/Configuration.cpp:
  Auto merged
ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/src/mgmsrv/InitConfigFileParser.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
ndb/src/mgmsrv/Services.cpp:
  Auto merged
ndb/src/mgmsrv/Services.hpp:
  Auto merged
ndb/src/mgmsrv/main.cpp:
  Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
  Auto merged
ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged
ndb/src/ndbapi/ndberror.c:
  Auto merged
ndb/tools/Makefile.am:
  Auto merged

22 files changed, 156 insertions, 176 deletions

diff --git a/ndb/include/Makefile.am b/ndb/include/Makefile.am
index b1e72dacffd..b29433a59b7 100644
--- a/ndb/include/Makefile.am
+++ b/ndb/include/Makefile.am
@@ -28,15 +28,14 @@ ndbapi/NdbIndexScanOperation.hpp \
 ndbapi/ndberror.h
 
 mgmapiinclude_HEADERS = \
-mgmapi/LocalConfig.hpp \
 mgmapi/mgmapi.h \
-mgmapi/mgmapi_debug.h
+mgmapi/mgmapi_debug.h \
+mgmapi/mgmapi_config_parameters.h \
+mgmapi/mgmapi_config_parameters_debug.h
 
 noinst_HEADERS = \
 ndb_global.h \
-ndb_net.h \
-mgmapi/mgmapi_config_parameters.h \
-mgmapi/mgmapi_config_parameters_debug.h
+ndb_net.h
 
 EXTRA_DIST = debugger editline kernel logger mgmcommon \
 portlib transporter util
diff --git a/ndb/include/debugger/EventLogger.hpp b/ndb/include/debugger/EventLogger.hpp
index 686989089ae..ddf21b79f5f 100644
--- a/ndb/include/debugger/EventLogger.hpp
+++ b/ndb/include/debugger/EventLogger.hpp
@@ -48,6 +48,10 @@ public:
 
   static const EventRepLogLevelMatrix matrix[];
   static const Uint32 matrixSize;
+  static int event_lookup(int eventType,
+			  LogLevel::EventCategory &cat,
+			  Uint32 &threshold, 
+			  Logger::LoggerLevel &severity);
 };
 
 /**
diff --git a/ndb/include/kernel/LogLevel.hpp b/ndb/include/kernel/LogLevel.hpp
index 5981ca4701a..3c2f349e0e1 100644
--- a/ndb/include/kernel/LogLevel.hpp
+++ b/ndb/include/kernel/LogLevel.hpp
@@ -73,7 +73,7 @@ public:
   /**
    * Note level is valid as 0-15
    */
-  void setLogLevel(EventCategory ec, Uint32 level = 7);
+  int setLogLevel(EventCategory ec, Uint32 level = 7);
   
   /**
    * Get the loglevel (0-15) for a category
@@ -119,10 +119,14 @@ LogLevel::clear(){
 }
 
 inline
-void
+int
 LogLevel::setLogLevel(EventCategory ec, Uint32 level){
-  assert(ec >= 0 && (Uint32) ec < LOGLEVEL_CATEGORIES);
-  logLevelData[ec] = (Uint8)level;
+  if (ec >= 0 && (Uint32) ec < LOGLEVEL_CATEGORIES)
+  {
+    logLevelData[ec] = (Uint8)level;
+    return 0;
+  }
+  return 1;
 }
 
 inline
diff --git a/ndb/include/kernel/signaldata/ArbitSignalData.hpp b/ndb/include/kernel/signaldata/ArbitSignalData.hpp
index f255b8dcbbe..34b73644a13 100644
--- a/ndb/include/kernel/signaldata/ArbitSignalData.hpp
+++ b/ndb/include/kernel/signaldata/ArbitSignalData.hpp
@@ -94,13 +94,14 @@ public:
 
     // arbitration result
     LoseNodes = 41,             // lose on ndb node count
-    WinGroups = 42,             // we win, no need for arbitration
-    LoseGroups = 43,            // we lose, missing node group
-    Partitioning = 44,          // possible network partitioning
-    WinChoose = 45,             // positive reply
-    LoseChoose = 46,            // negative reply
-    LoseNorun = 47,             // arbitrator required but not running
-    LoseNocfg = 48,             // arbitrator required but none configured
+    WinNodes = 42,              // win on ndb node count
+    WinGroups = 43,             // we win, no need for arbitration
+    LoseGroups = 44,            // we lose, missing node group
+    Partitioning = 45,          // possible network partitioning
+    WinChoose = 46,             // positive reply
+    LoseChoose = 47,            // negative reply
+    LoseNorun = 48,             // arbitrator required but not running
+    LoseNocfg = 49,             // arbitrator required but none configured
 
     // general error codes
     ErrTicket = 91,             // invalid arbitrator-ticket
diff --git a/ndb/include/kernel/signaldata/BackupImpl.hpp b/ndb/include/kernel/signaldata/BackupImpl.hpp
index 1872069daa7..2ac91570aad 100644
--- a/ndb/include/kernel/signaldata/BackupImpl.hpp
+++ b/ndb/include/kernel/signaldata/BackupImpl.hpp
@@ -78,15 +78,15 @@ public:
   STATIC_CONST( SignalLength = 3 );
   
   enum ErrorCode {
-    Undefined = 200,
-    FailedToAllocateBuffers = 202,
-    FailedToSetupFsBuffers = 203,
-    FailedToAllocateTables = 204,
-    FailedInsertFileHeader = 205,
-    FailedInsertTableList = 206,
-    FailedAllocateTableMem = 207,
-    FailedToAllocateFileRecord = 208,
-    FailedToAllocateAttributeRecord = 209
+    Undefined = 1340,
+    FailedToAllocateBuffers = 1342,
+    FailedToSetupFsBuffers = 1343,
+    FailedToAllocateTables = 1344,
+    FailedInsertFileHeader = 1345,
+    FailedInsertTableList = 1346,
+    FailedAllocateTableMem = 1347,
+    FailedToAllocateFileRecord = 1348,
+    FailedToAllocateAttributeRecord = 1349
   };
 private:
   Uint32 backupId;
diff --git a/ndb/include/kernel/signaldata/BackupSignalData.hpp b/ndb/include/kernel/signaldata/BackupSignalData.hpp
index 42eb8464d53..fb018026a49 100644
--- a/ndb/include/kernel/signaldata/BackupSignalData.hpp
+++ b/ndb/include/kernel/signaldata/BackupSignalData.hpp
@@ -119,12 +119,13 @@ public:
 
 private:
   enum ErrorCodes {
-    Undefined = 100,
-    IAmNotMaster  = 101,
-    OutOfBackupRecord = 102,
-    OutOfResources = 103,
-    SequenceFailure = 104,
-    BackupDefinitionNotImplemented = 105
+    Undefined = 1300,
+    IAmNotMaster  = 1301,
+    OutOfBackupRecord = 1302,
+    OutOfResources = 1303,
+    SequenceFailure = 1304,
+    BackupDefinitionNotImplemented = 1305,
+    CannotBackupDiskless = 1306
   };
   Uint32 senderData;
   Uint32 errorCode;
@@ -232,13 +233,13 @@ public:
   STATIC_CONST( SignalLength = 3 );
   
   enum RequestType {
-    ClientAbort = 1,
-    BackupComplete = 2,
-    BackupFailure = 3,  // General backup failure coordinator -> slave
-    LogBufferFull = 4,  //                        slave -> coordinator
-    FileOrScanError = 5, //                       slave -> coordinator
-    BackupFailureDueToNodeFail = 6, //             slave -> slave
-    OkToClean = 7                  //             master -> slave
+    ClientAbort = 1321,
+    BackupComplete = 1322,
+    BackupFailure = 1323,  // General backup failure coordinator -> slave
+    LogBufferFull = 1324,  //                        slave -> coordinator
+    FileOrScanError = 1325, //                       slave -> coordinator
+    BackupFailureDueToNodeFail = 1326, //             slave -> slave
+    OkToClean = 1327                  //             master -> slave
   };
 private:
   Uint32 requestType;
diff --git a/ndb/include/kernel/signaldata/CreateEvnt.hpp b/ndb/include/kernel/signaldata/CreateEvnt.hpp
index 65a07c122a2..e911fa36ce6 100644
--- a/ndb/include/kernel/signaldata/CreateEvnt.hpp
+++ b/ndb/include/kernel/signaldata/CreateEvnt.hpp
@@ -475,14 +475,14 @@ struct CreateEvntRef {
   }
 };
 inline bool CreateEvntRef::isTemporary() const
-{ return (errorCode &  CreateEvntRef::Temporary) > 0; };
+{ return (errorCode &  CreateEvntRef::Temporary) > 0; }
 inline void CreateEvntRef::setTemporary()
-{ errorCode |=  CreateEvntRef::Temporary; };
+{ errorCode |=  CreateEvntRef::Temporary; }
 inline CreateEvntRef::ErrorCode CreateEvntRef::setTemporary(ErrorCode ec)
 { return (CreateEvntRef::ErrorCode) 
-    (errorCode = ((Uint32) ec | (Uint32)CreateEvntRef::Temporary)); };
+    (errorCode = ((Uint32) ec | (Uint32)CreateEvntRef::Temporary)); }
 inline CreateEvntRef::ErrorCode CreateEvntRef::makeTemporary(ErrorCode ec)
 { return (CreateEvntRef::ErrorCode) 
-    ( (Uint32) ec | (Uint32)CreateEvntRef::Temporary ); };
+    ( (Uint32) ec | (Uint32)CreateEvntRef::Temporary ); }
 
 #endif
diff --git a/ndb/include/kernel/signaldata/PackedSignal.hpp b/ndb/include/kernel/signaldata/PackedSignal.hpp
index 057bb39b25a..ea0ff6db526 100644
--- a/ndb/include/kernel/signaldata/PackedSignal.hpp
+++ b/ndb/include/kernel/signaldata/PackedSignal.hpp
@@ -38,6 +38,6 @@ class PackedSignal {
 };
 
 inline
-Uint32 PackedSignal::getSignalType(Uint32 data) { return data >> 28; };
+Uint32 PackedSignal::getSignalType(Uint32 data) { return data >> 28; }
 
 #endif
diff --git a/ndb/include/kernel/signaldata/SumaImpl.hpp b/ndb/include/kernel/signaldata/SumaImpl.hpp
index 089132cd9aa..89ade067dcd 100644
--- a/ndb/include/kernel/signaldata/SumaImpl.hpp
+++ b/ndb/include/kernel/signaldata/SumaImpl.hpp
@@ -159,12 +159,12 @@ public:
   Uint32 subscriberRef;
 };
 inline bool SubStartRef::isTemporary() const
-{ return (errorCode &  SubStartRef::Temporary) > 0; };
+{ return (errorCode &  SubStartRef::Temporary) > 0; }
 inline void SubStartRef::setTemporary()
-{ errorCode |=  SubStartRef::Temporary; };
+{ errorCode |=  SubStartRef::Temporary; }
 inline SubStartRef::ErrorCode SubStartRef::setTemporary(ErrorCode ec)
 { return (SubStartRef::ErrorCode) 
-    (errorCode = ((Uint32) ec | (Uint32)SubStartRef::Temporary)); };
+    (errorCode = ((Uint32) ec | (Uint32)SubStartRef::Temporary)); }
 
 class SubStartConf {
   /**
@@ -239,12 +239,12 @@ public:
   };
 };
 inline bool SubStopRef::isTemporary() const
-{ return (errorCode &  SubStopRef::Temporary) > 0; };
+{ return (errorCode &  SubStopRef::Temporary) > 0; }
 inline void SubStopRef::setTemporary()
-{ errorCode |=  SubStopRef::Temporary; };
+{ errorCode |=  SubStopRef::Temporary; }
 inline SubStopRef::ErrorCode SubStopRef::setTemporary(ErrorCode ec)
 { return (SubStopRef::ErrorCode) 
-    (errorCode = ((Uint32) ec | (Uint32)SubStopRef::Temporary)); };
+    (errorCode = ((Uint32) ec | (Uint32)SubStopRef::Temporary)); }
 
 class SubStopConf {
   /**
@@ -515,12 +515,12 @@ public:
   };
 };
 inline bool SubRemoveRef::isTemporary() const
-{ return (err &  SubRemoveRef::Temporary) > 0; };
+{ return (err &  SubRemoveRef::Temporary) > 0; }
 inline void SubRemoveRef::setTemporary()
-{ err |=  SubRemoveRef::Temporary; };
+{ err |=  SubRemoveRef::Temporary; }
 inline SubRemoveRef::ErrorCode SubRemoveRef::setTemporary(ErrorCode ec)
 { return (SubRemoveRef::ErrorCode) 
-    (errorCode = ((Uint32) ec | (Uint32)SubRemoveRef::Temporary)); };
+    (errorCode = ((Uint32) ec | (Uint32)SubRemoveRef::Temporary)); }
 
 class SubRemoveConf {
   /**
diff --git a/ndb/include/logger/Logger.hpp b/ndb/include/logger/Logger.hpp
index c6145f2091a..f12297023b7 100644
--- a/ndb/include/logger/Logger.hpp
+++ b/ndb/include/logger/Logger.hpp
@@ -101,7 +101,7 @@ public:
   /** The log levels. NOTE: Could not use the name LogLevel since 
    * it caused conflicts with another class.
    */
-  enum LoggerLevel {LL_OFF, LL_DEBUG, LL_INFO, LL_WARNING, LL_ERROR,
+  enum LoggerLevel {LL_ON, LL_DEBUG, LL_INFO, LL_WARNING, LL_ERROR,
 		    LL_CRITICAL, LL_ALERT, LL_ALL};
   
   /**
diff --git a/ndb/include/mgmapi/LocalConfig.hpp b/ndb/include/mgmapi/LocalConfig.hpp
deleted file mode 100644
index 9ceeffdba36..00000000000
--- a/ndb/include/mgmapi/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/mgmapi/mgmapi.h b/ndb/include/mgmapi/mgmapi.h
index 6b261bd8751..3d4a34d6488 100644
--- a/ndb/include/mgmapi/mgmapi.h
+++ b/ndb/include/mgmapi/mgmapi.h
@@ -245,7 +245,9 @@ extern "C" {
    *   Log severities (used to filter the cluster log)
    */
   enum ndb_mgm_clusterlog_level {
-    NDB_MGM_CLUSTERLOG_OFF = 0,             /*< Cluster log off*/
+    NDB_MGM_ILLEGAL_CLUSTERLOG_LEVEL = -1,
+    /* must range from 0 and up, indexes into an array */
+    NDB_MGM_CLUSTERLOG_ON    = 0,           /*< Cluster log on*/
     NDB_MGM_CLUSTERLOG_DEBUG = 1,           /*< Used in NDB Cluster
 					     *< developement
 					     */
@@ -265,7 +267,8 @@ extern "C" {
 					     *< corrected immediately,
 					     *< such as a corrupted system
 					     */
-    NDB_MGM_CLUSTERLOG_ALL = 7              /*< All severities on*/
+    /* must be next number, works as bound in loop */
+    NDB_MGM_CLUSTERLOG_ALL = 7              /*< All severities */
   };
 
   /**
@@ -357,11 +360,27 @@ extern "C" {
   /** 
    * Create a handle to a management server
    *
-   * @return                A management handle<br>
-   *                        or NULL if no management handle could be created. 
+   * @return                 A management handle<br>
+   *                         or NULL if no management handle could be created. 
    */
   NdbMgmHandle ndb_mgm_create_handle();
   
+  /** 
+   * Set connecst string to management server
+   *
+   * @param   handle         Management handle
+   * @param   connect_string Connect string to the management server, 
+   *
+   * @return                -1 on error.
+   */
+  int ndb_mgm_set_connectstring(NdbMgmHandle handle,
+				const char *connect_string);
+
+  int ndb_mgm_get_configuration_nodeid(NdbMgmHandle handle);
+  int ndb_mgm_get_connected_port(NdbMgmHandle handle);
+  const char *ndb_mgm_get_connected_host(NdbMgmHandle handle);
+  const char *ndb_mgm_get_connectstring(NdbMgmHandle handle, char *buf, int buf_sz);
+
   /**
    * Destroy a management server handle
    *
@@ -379,11 +398,10 @@ extern "C" {
    * Connect to a management server
    *
    * @param   handle        Management handle.
-   * @param   mgmsrv        Hostname and port of the management server, 
-   *                        "hostname:port".
    * @return                -1 on error.
    */
-  int ndb_mgm_connect(NdbMgmHandle handle, const char * mgmsrv);
+  int ndb_mgm_connect(NdbMgmHandle handle, int no_retries,
+		      int retry_delay_in_seconds, int verbose);
   
   /**
    * Disconnect from a management server
@@ -566,11 +584,13 @@ extern "C" {
    *
    * @param   handle        NDB management handle.
    * @param   level         A cluster log level to filter.
+   * @param   enable        set 1=enable 0=disable
    * @param   reply         Reply message.
    * @return                -1 on error.
    */
   int ndb_mgm_filter_clusterlog(NdbMgmHandle handle,
 				enum ndb_mgm_clusterlog_level level,
+				int enable,
 				struct ndb_mgm_reply* reply);
 
   /**
@@ -606,6 +626,11 @@ extern "C" {
 				      int level,
 				      struct ndb_mgm_reply* reply);
 
+  ndb_mgm_clusterlog_level
+  ndb_mgm_match_clusterlog_level(const char * name);
+  const char * 
+  ndb_mgm_get_clusterlog_level_string(enum ndb_mgm_clusterlog_level level);
+
   /**
    * Set log category and levels for the Node
    *
@@ -642,11 +667,15 @@ extern "C" {
    * Start backup
    *
    * @param   handle        NDB management handle.
+   * @param   wait_completed 0=don't wait for confirmation
+                             1=wait for backup started
+                             2=wait for backup completed
    * @param   backup_id     Backup id is returned from function.
    * @param   reply         Reply message.
    * @return                -1 on error.
    */
-  int ndb_mgm_start_backup(NdbMgmHandle handle, unsigned int* backup_id,
+  int ndb_mgm_start_backup(NdbMgmHandle handle, int wait_completed,
+			   unsigned int* backup_id,
 			   struct ndb_mgm_reply* reply);
 
   /**
@@ -710,9 +739,7 @@ extern "C" {
   void ndb_mgm_destroy_configuration(struct ndb_mgm_configuration *);
 
   int ndb_mgm_alloc_nodeid(NdbMgmHandle handle,
-			   unsigned version,
-			   unsigned *pnodeid,
-			   int nodetype);
+			   unsigned version, int nodetype);
   /**
    * Config iterator
    */
@@ -735,6 +762,7 @@ extern "C" {
   int ndb_mgm_get_string_parameter(const ndb_mgm_configuration_iterator*,
 				   int param, const char  ** value);
   int ndb_mgm_purge_stale_sessions(NdbMgmHandle handle, char **);
+  int ndb_mgm_check_connection(NdbMgmHandle handle);
 #ifdef __cplusplus
 }
 #endif
diff --git a/ndb/include/mgmcommon/ConfigRetriever.hpp b/ndb/include/mgmcommon/ConfigRetriever.hpp
index 6c32255e921..8461658748e 100644
--- a/ndb/include/mgmcommon/ConfigRetriever.hpp
+++ b/ndb/include/mgmcommon/ConfigRetriever.hpp
@@ -20,7 +20,6 @@
 #include <ndb_types.h>
 #include <mgmapi.h>
 #include <BaseString.hpp>
-#include <LocalConfig.hpp>
 
 /**
  * @class ConfigRetriever
@@ -28,10 +27,11 @@
  */
 class ConfigRetriever {
 public:
-  ConfigRetriever(LocalConfig &local_config, Uint32 version, Uint32 nodeType);
+  ConfigRetriever(const char * _connect_string,
+		  Uint32 version, Uint32 nodeType);
   ~ConfigRetriever();
 
-  int do_connect(int exit_on_connect_failure= false);
+  int do_connect(int no_retries, int retry_delay_in_seconds, int verbose);
   
   /**
    * Get configuration for current node.
@@ -46,12 +46,14 @@ public:
    */
   struct ndb_mgm_configuration * getConfig();
   
+  void resetError();
+  int hasError();
   const char * getErrorString();
 
   /**
    * @return Node id of this node (as stated in local config or connectString)
    */
-  Uint32 allocNodeId();
+  Uint32 allocNodeId(int no_retries, int retry_delay_in_seconds);
 
   /**
    * Get config using socket
@@ -68,22 +70,27 @@ public:
    */
   bool verifyConfig(const struct ndb_mgm_configuration *, Uint32 nodeid);
 
-  Uint32 get_mgmd_port() const {return m_mgmd_port;};
-  const char *get_mgmd_host() const {return m_mgmd_host;};
+  Uint32 get_mgmd_port() const;
+  const char *get_mgmd_host() const;
+  const char *get_connectstring(char *buf, int buf_sz) const;
+
+  Uint32 get_configuration_nodeid() const;
 private:
   BaseString errorString;
   enum ErrorType {
-    CR_ERROR = 0,
-    CR_RETRY = 1
+    CR_NO_ERROR = 0,
+    CR_ERROR = 1,
+    CR_RETRY = 2
   };
   ErrorType latestErrorType;
   
   void setError(ErrorType, const char * errorMsg);
   
-  struct LocalConfig&   _localConfig;
-  Uint32                _ownNodeId;
+  Uint32      _ownNodeId;
+  /*
   Uint32      m_mgmd_port;
   const char *m_mgmd_host;
+  */
 
   Uint32 m_version;
   Uint32 m_node_type;
diff --git a/ndb/include/ndbapi/NdbConnection.hpp b/ndb/include/ndbapi/NdbConnection.hpp
index 5043cb0e26d..166355cae17 100644
--- a/ndb/include/ndbapi/NdbConnection.hpp
+++ b/ndb/include/ndbapi/NdbConnection.hpp
@@ -607,8 +607,8 @@ private:
   NdbOperation*	theLastExecOpInList;	    // Last executing operation in list.
 
 
-  NdbOperation*	theCompletedFirstOp;	    // First operation in completed 
-                                            // operation list.
+  NdbOperation*	theCompletedFirstOp;	    // First & last operation in completed 
+  NdbOperation*	theCompletedLastOp;         // operation list.
 
   Uint32	theNoOfOpSent;				// How many operations have been sent	    
   Uint32	theNoOfOpCompleted;			// How many operations have completed
diff --git a/ndb/include/ndbapi/NdbDictionary.hpp b/ndb/include/ndbapi/NdbDictionary.hpp
index 217243071d0..f0c8a10f488 100644
--- a/ndb/include/ndbapi/NdbDictionary.hpp
+++ b/ndb/include/ndbapi/NdbDictionary.hpp
@@ -982,13 +982,6 @@ public:
      */
     const Table * getTable(const char * name);
 
-    /**
-     * Get table with given name for alteration.
-     * @param name   Name of table to alter
-     * @return table if successful. NULL if undefined
-     */
-    Table getTableForAlteration(const char * name);
-
 #ifndef DOXYGEN_SHOULD_SKIP_INTERNAL
     /**
      * Invalidate cached table object
diff --git a/ndb/include/ndbapi/NdbIndexScanOperation.hpp b/ndb/include/ndbapi/NdbIndexScanOperation.hpp
index 66b3fc9d43b..a3388f62f58 100644
--- a/ndb/include/ndbapi/NdbIndexScanOperation.hpp
+++ b/ndb/include/ndbapi/NdbIndexScanOperation.hpp
@@ -113,7 +113,7 @@ public:
    * Reset bounds and put operation in list that will be
    *   sent on next execute
    */
-  int reset_bounds();
+  int reset_bounds(bool forceSend = false);
   
   bool getSorted() const { return m_ordered; }
 private:
@@ -127,8 +127,8 @@ private:
   virtual NdbRecAttr* getValue_impl(const NdbColumnImpl*, char*);
 
   void fix_get_values();
-  int next_result_ordered(bool fetchAllowed);
-  int send_next_scan_ordered(Uint32 idx);
+  int next_result_ordered(bool fetchAllowed, bool forceSend = false);
+  int send_next_scan_ordered(Uint32 idx, bool forceSend = false);
   int compare(Uint32 key, Uint32 cols, const NdbReceiver*, const NdbReceiver*);
 
   Uint32 m_sort_columns;
diff --git a/ndb/include/ndbapi/NdbResultSet.hpp b/ndb/include/ndbapi/NdbResultSet.hpp
index 478daf8aad2..dc0288a380c 100644
--- a/ndb/include/ndbapi/NdbResultSet.hpp
+++ b/ndb/include/ndbapi/NdbResultSet.hpp
@@ -89,17 +89,17 @@ public:
    * -   1: if there are no more tuples to scan.
    * -   2: if there are no more cached records in NdbApi
    */
-  int nextResult(bool fetchAllowed = true);
+  int nextResult(bool fetchAllowed = true, bool forceSend = false);
 
   /**
    * Close result set (scan)
    */
-  void close();
+  void close(bool forceSend = false);
 
   /**
    * Restart
    */
-  int restart();
+  int restart(bool forceSend = false);
   
   /**
    * Transfer scan operation to an updating transaction. Use this function 
diff --git a/ndb/include/ndbapi/NdbScanOperation.hpp b/ndb/include/ndbapi/NdbScanOperation.hpp
index 5689b62526c..f25f9405033 100644
--- a/ndb/include/ndbapi/NdbScanOperation.hpp
+++ b/ndb/include/ndbapi/NdbScanOperation.hpp
@@ -90,11 +90,11 @@ protected:
   NdbScanOperation(Ndb* aNdb);
   virtual ~NdbScanOperation();
 
-  int nextResult(bool fetchAllowed = true);
+  int nextResult(bool fetchAllowed = true, bool forceSend = false);
   virtual void release();
   
-  void closeScan();
-  int close_impl(class TransporterFacade*);
+  void closeScan(bool forceSend = false);
+  int close_impl(class TransporterFacade*, bool forceSend = false);
 
   // Overloaded methods from NdbCursorOperation
   int executeCursor(int ProcessorId);
@@ -103,6 +103,7 @@ protected:
   int init(const NdbTableImpl* tab, NdbConnection* myConnection);
   int prepareSend(Uint32  TC_ConnectPtr, Uint64  TransactionId);
   int doSend(int ProcessorId);
+  void checkForceSend(bool forceSend);
 
   virtual void setErrorCode(int aErrorCode);
   virtual void setErrorCodeAbort(int aErrorCode);
@@ -147,7 +148,7 @@ protected:
   Uint32 m_sent_receivers_count;  // NOTE needs mutex to access
   NdbReceiver** m_sent_receivers; // receive thread puts them here
   
-  int send_next_scan(Uint32 cnt, bool close);
+  int send_next_scan(Uint32 cnt, bool close, bool forceSend = false);
   void receiver_delivered(NdbReceiver*);
   void receiver_completed(NdbReceiver*);
   void execCLOSE_SCAN_REP();
@@ -157,7 +158,7 @@ protected:
   
   Uint32 m_ordered;
 
-  int restart();
+  int restart(bool forceSend = false);
 };
 
 inline
diff --git a/ndb/include/ndbapi/ndb_cluster_connection.hpp b/ndb/include/ndbapi/ndb_cluster_connection.hpp
index 6e24e084f58..db1cd0b119e 100644
--- a/ndb/include/ndbapi/ndb_cluster_connection.hpp
+++ b/ndb/include/ndbapi/ndb_cluster_connection.hpp
@@ -19,7 +19,6 @@
 #define CLUSTER_CONNECTION_HPP
 
 class TransporterFacade;
-struct LocalConfig;
 class ConfigRetriever;
 struct NdbThread;
 
@@ -31,14 +30,15 @@ class Ndb_cluster_connection {
 public:
   Ndb_cluster_connection(const char * connect_string = 0);
   ~Ndb_cluster_connection();
-  int connect(int reconnect= 0);
+  int connect(int no_retries, int retry_delay_in_seconds, int verbose);
   int start_connect_thread(int (*connect_callback)(void)= 0);
+  const char *get_connectstring(char *buf, int buf_sz) const;
+  int get_connected_port() const;
+  const char *get_connected_host() const;
 private:
   friend void* run_ndb_cluster_connection_connect_thread(void*);
   void connect_thread();
-  char *m_connect_string;
   TransporterFacade *m_facade;
-  LocalConfig *m_local_config;
   ConfigRetriever *m_config_retriever;
   NdbThread *m_connect_thread;
   int (*m_connect_callback)(void);
diff --git a/ndb/include/ndbapi/ndberror.h b/ndb/include/ndbapi/ndberror.h
index 5c2d85b82a6..ceb1881a4cc 100644
--- a/ndb/include/ndbapi/ndberror.h
+++ b/ndb/include/ndbapi/ndberror.h
@@ -46,7 +46,8 @@ typedef enum
   ndberror_cl_internal_error = 12,
   ndberror_cl_function_not_implemented = 13,
   ndberror_cl_unknown_error_code = 14,
-  ndberror_cl_node_shutdown = 15
+  ndberror_cl_node_shutdown = 15,
+  ndberror_cl_configuration = 16  
 } ndberror_classification_enum;
 
 
diff --git a/ndb/include/util/BaseString.hpp b/ndb/include/util/BaseString.hpp
index 066a24f294e..02a6a3b3e66 100644
--- a/ndb/include/util/BaseString.hpp
+++ b/ndb/include/util/BaseString.hpp
@@ -48,10 +48,10 @@ public:
   bool empty() const;
 
   /** @brief Convert to uppercase */
-  void ndb_toupper();
+  BaseString& ndb_toupper();
 
   /** @brief Convert to lowercase */
-  void ndb_tolower();
+  BaseString& ndb_tolower();
 
   /** @brief Assigns from a char * */
   BaseString& assign(const char* s);
@@ -206,16 +206,18 @@ BaseString::empty() const
   return m_len == 0;
 }
 
-inline void
+inline BaseString&
 BaseString::ndb_toupper() {
   for(unsigned i = 0; i < length(); i++)
     m_chr[i] = toupper(m_chr[i]);
+  return *this;
 }
 
-inline void
+inline BaseString&
 BaseString::ndb_tolower() {
   for(unsigned i = 0; i < length(); i++)
     m_chr[i] = tolower(m_chr[i]);
+  return *this;
 }
 
 inline bool
diff --git a/ndb/include/util/ndb_opts.h b/ndb/include/util/ndb_opts.h
index 6cba9c04449..f7ae3b5489e 100644
--- a/ndb/include/util/ndb_opts.h
+++ b/ndb/include/util/ndb_opts.h
@@ -32,10 +32,13 @@
     0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0 }, \
   { "version", 'V', "Output version information and exit.", 0, 0, 0, \
     GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0 }, \
-  { "connect-string", 'c', \
+  { "ndb-connectstring", 'c', \
     "Set connect string for connecting to ndb_mgmd. " \
-    "<constr>=\"host=<hostname:port>[;nodeid=<id>]\". " \
-    "Overides specifying entries in NDB_CONNECTSTRING and config file", \
+    "Syntax: \"[nodeid=<id>;][host=]<hostname>[:<port>]\". " \
+    "Overides specifying entries in NDB_CONNECTSTRING and Ndb.cfg", \
+    (gptr*) &opt_connect_str, (gptr*) &opt_connect_str, 0, \
+    GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },\
+  { "connect-string", 'c', "same as --ndb-connectstring",\
     (gptr*) &opt_connect_str, (gptr*) &opt_connect_str, 0, \
     GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 }
 #else
@@ -46,11 +49,14 @@
     0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0 }, \
   { "version", 'V', "Output version information and exit.", 0, 0, 0, \
     GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0 }, \
-  { "connect-string", 'c', \
+  { "ndb-connectstring", 'c', \
     "Set connect string for connecting to ndb_mgmd. " \
-    "<constr>=\"host=<hostname:port>[;nodeid=<id>]\". " \
-    "Overides specifying entries in NDB_CONNECTSTRING and config file", \
+    "Syntax: \"[nodeid=<id>;][host=]<hostname>[:<port>]\". " \
+    "Overides specifying entries in NDB_CONNECTSTRING and Ndb.cfg", \
     (gptr*) &opt_connect_str, (gptr*) &opt_connect_str, 0, \
+    GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },\
+  { "connect-string", 'c', "same as --ndb-connectstring",\
+    (gptr*) &opt_connect_str, (gptr*) &opt_connect_str, 0,\
     GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 }
 #endif