bk commit into 5.1 tree (jonas:1.2155)

[jonas]

Below is the list of changes that have just been committed into a local
5.1 repository of jonas. When jonas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2155 06/05/19 10:36:19 jonas@stripped +3 -0
  Merge perch.ndb.mysql.com:/home/jonas/src/50-work
  into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb

  storage/ndb/src/mgmsrv/Services.cpp
    1.65 06/05/19 10:36:15 jonas@stripped +0 -0
    Auto merged

  storage/ndb/src/common/util/SocketServer.cpp
    1.21 06/05/19 10:36:15 jonas@stripped +0 -0
    Auto merged

  storage/ndb/include/util/SocketServer.hpp
    1.12 06/05/19 10:36:15 jonas@stripped +0 -0
    Auto merged

  storage/ndb/src/mgmsrv/Services.cpp
    1.45.20.2 06/05/19 10:36:15 jonas@stripped +0 -0
    Merge rename: ndb/src/mgmsrv/Services.cpp -> storage/ndb/src/mgmsrv/Services.cpp

  storage/ndb/src/common/util/SocketServer.cpp
    1.15.5.2 06/05/19 10:36:15 jonas@stripped +0 -0
    Merge rename: ndb/src/common/util/SocketServer.cpp ->
storage/ndb/src/common/util/SocketServer.cpp

  storage/ndb/include/util/SocketServer.hpp
    1.6.4.2 06/05/19 10:36:15 jonas@stripped +0 -0
    Merge rename: ndb/include/util/SocketServer.hpp ->
storage/ndb/include/util/SocketServer.hpp

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/mysql-5.1-new-ndb/RESYNC

--- 1.6.4.1/ndb/include/util/SocketServer.hpp	2006-05-19 09:59:31 +02:00
+++ 1.12/storage/ndb/include/util/SocketServer.hpp	2006-05-19 10:36:15 +02:00
@@ -60,6 +60,7 @@
    */
   class Service {
   public:
+    Service() {}
     virtual ~Service(){}
     
     /**

--- 1.45.20.1/ndb/src/mgmsrv/Services.cpp	2006-05-19 09:59:31 +02:00
+++ 1.65/storage/ndb/src/mgmsrv/Services.cpp	2006-05-19 10:36:15 +02:00
@@ -485,7 +485,8 @@
     NDB_TICKS tick= 0;
     /* only report error on second attempt as not to clog the cluster log */
     while (!m_mgmsrv.alloc_node_id(&tmp, (enum ndb_mgm_node_type)nodetype, 
-                                   (struct sockaddr*)&addr, &addrlen, error_code,
error_string,
+                                   (struct sockaddr*)&addr, &addrlen,
+                                   error_code, error_string,
                                    tick == 0 ? 0 : log_event))
     {
       /* NDB_MGM_ALLOCID_CONFIG_MISMATCH is a non retriable error */