Merge

ndb/include/util/SocketServer.hpp:
  Auto merged
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  Auto merged
ndb/src/common/util/SocketClient.cpp:
  Auto merged
ndb/src/common/util/SocketServer.cpp:
  Auto merged
ndb/src/common/util/version.c:
  Auto merged
ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
  Auto merged
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
ndb/src/mgmclient/main.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
ndb/src/ndbapi/ClusterMgr.cpp:
  Auto merged
ndb/tools/restore/restore_main.cpp:
  Auto merged
ndb/include/util/ndb_opts.h:
  merge
ndb/src/common/mgmcommon/IPCConfig.cpp:
  merge
ndb/src/common/transporter/TransporterRegistry.cpp:
  merge
ndb/src/mgmapi/mgmapi.cpp:
  merge
ndb/src/mgmclient/CommandInterpreter.cpp:
  merge
ndb/src/mgmsrv/MgmtSrvr.cpp:
  merge
ndb/src/mgmsrv/Services.cpp:
  merge
ndb/src/mgmsrv/main.cpp:
  merge
ndb/src/ndbapi/TransporterFacade.cpp:
  merge

3 files changed, 11 insertions, 2 deletions

diff --git a/ndb/include/util/SocketServer.hpp b/ndb/include/util/SocketServer.hpp
index 2e1afb74945..4c37e63adf0 100644
--- a/ndb/include/util/SocketServer.hpp
+++ b/ndb/include/util/SocketServer.hpp
@@ -41,7 +41,13 @@ public:
   protected:
     friend class SocketServer;
     friend void* sessionThread_C(void*);
-    Session(NDB_SOCKET_TYPE sock): m_socket(sock){ m_stop = m_stopped = false;}
+    Session(NDB_SOCKET_TYPE sock): m_socket(sock)
+      {
+	DBUG_ENTER("SocketServer::Session");
+	DBUG_PRINT("enter",("NDB_SOCKET: %d", m_socket));
+	m_stop = m_stopped = false;
+	DBUG_VOID_RETURN;
+      }
     
     bool m_stop;    // Has the session been ordered to stop?
     bool m_stopped; // Has the session stopped?
diff --git a/ndb/include/util/ndb_opts.h b/ndb/include/util/ndb_opts.h
index 72abd6d5d7a..f60ac4e6a63 100644
--- a/ndb/include/util/ndb_opts.h
+++ b/ndb/include/util/ndb_opts.h
@@ -28,6 +28,7 @@
 my_bool	opt_ndb_optimized_node_selection
 
 int opt_ndb_nodeid;
+bool opt_endinfo= 0;
 my_bool opt_ndb_shm;
 const char *opt_ndb_connectstring= 0;
 const char *opt_connect_str= 0;
@@ -119,6 +120,7 @@ ndb_std_get_one_option(int optid,
     {
       DBUG_PUSH("d:t");
     }
+    opt_endinfo= 1;
     break;
 #endif
   case 'V':
diff --git a/ndb/include/util/version.h b/ndb/include/util/version.h
index 5459e44b818..62dc07d905a 100644
--- a/ndb/include/util/version.h
+++ b/ndb/include/util/version.h
@@ -30,7 +30,8 @@ extern "C" {
 
   Uint32 makeVersion(Uint32 major, Uint32 minor, Uint32 build);
 
-  const char* getVersionString(Uint32 version, const char * status);
+  const char* getVersionString(Uint32 version, const char * status,
+			       char *buf, unsigned sz);
   
   void ndbPrintVersion();
   Uint32 ndbGetOwnVersion();