Commit 81aa1ca0 authored by unknown's avatar unknown
Browse files

Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca 

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/include/kernel/signaldata/SumaImpl.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged
parents 483ce953 eaff83cb

storage/ndb/include/kernel/signaldata/SumaImpl.hpp

+2 −1
Original line number Diff line number Diff line
@@ -119,7 +119,8 @@ struct SubStartRef { 
    Undefined = 1,

    NF_FakeErrorREF = 11,

    Busy = 701,

    NotMaster = 702

    NotMaster = 702,

    PartiallyConnected = 1421

  };



  STATIC_CONST( SignalLength = 7 );

storage/ndb/src/kernel/blocks/suma/Suma.cpp

+10 −0
Original line number Diff line number Diff line
@@ -2396,6 +2396,16 @@ Suma::execSUB_START_REQ(Signal* signal){ 
    sendSubStartRef(signal, 1412);

    DBUG_VOID_RETURN;

  }



  if (c_startup.m_restart_server_node_id == 0 && 

      !c_connected_nodes.get(refToNode(subscriberRef)))

    

  {

    jam();

    sendSubStartRef(signal, SubStartRef::PartiallyConnected);

    return;

  }

  

  DBUG_PRINT("info",("c_subscriberPool  size: %d free: %d",

		     c_subscriberPool.getSize(),

		     c_subscriberPool.getNoOfFree()));

storage/ndb/src/ndbapi/ndberror.c

+1 −0
Original line number Diff line number Diff line
@@ -491,6 +491,7 @@ ErrorBundle ErrorCodes[] = { 
  { 1419, DMEC, SE, "Subscription already dropped" },



  { 1420, DMEC, TR, "Subscriber manager busy with adding/removing a table" },

  { 1421, DMEC, SE, "Partially connected API in NdbOperation::execute()" },



  { 4004, DMEC, AE, "Attribute name or id not found in the table" },