Commit af751eeb authored by unknown's avatar unknown
Browse files

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 

into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
parents 0343a80b 9303456f

ndb/src/kernel/blocks/dbtc/DbtcMain.cpp

+12 −0
Original line number Diff line number Diff line
@@ -6978,6 +6978,18 @@ void Dbtc::checkScanActiveInFailedLqh(Signal* signal, 
	  found = true;

	}

      }



      ScanFragList deliv(c_scan_frag_pool, scanptr.p->m_delivered_scan_frags);

      for(deliv.first(ptr); !ptr.isNull(); deliv.next(ptr))

      {

	jam();

	if (refToNode(ptr.p->lqhBlockref) == failedNodeId)

	{

	  jam();

	  found = true;

	  break;

	}

      }

    }

    if(found){

      jam();

ndb/src/kernel/vm/RequestTracker.hpp

+2 −2
Original line number Diff line number Diff line
@@ -26,12 +26,12 @@ public: 
  void init() { m_confs.clear(); m_nRefs = 0; }



  template<typename SignalClass>

  void init(SafeCounterManager& mgr,

  bool init(SafeCounterManager& mgr,

	    NodeReceiverGroup rg, Uint16 GSN, Uint32 senderData)

  {

    init();

    SafeCounter tmp(mgr, m_sc);

    tmp.init<SignalClass>(rg, GSN, senderData);

    return tmp.init<SignalClass>(rg, GSN, senderData);

  }



  bool ignoreRef(SafeCounterManager& mgr, Uint32 nodeId)

ndb/src/kernel/vm/SafeCounter.hpp

+14 −8
Original line number Diff line number Diff line
@@ -230,10 +230,13 @@ inline 
bool

SafeCounter::init(NodeReceiverGroup rg, Uint16 GSN, Uint32 senderData){

  

  bool b = init<Ref>(rg.m_block, GSN, senderData);

  if (init<Ref>(rg.m_block, GSN, senderData))

  {

    m_nodes = rg.m_nodes;

    m_count = m_nodes.count();

  return b;

    return true;

  }

  return false;

}



template<typename Ref>
@@ -241,10 +244,13 @@ inline 
bool

SafeCounter::init(NodeReceiverGroup rg, Uint32 senderData){

  

  bool b = init<Ref>(rg.m_block, Ref::GSN, senderData);

  if (init<Ref>(rg.m_block, Ref::GSN, senderData))

  {

    m_nodes = rg.m_nodes;

    m_count = m_nodes.count();

  return b;

    return true;

  }

  return false;

}



inline

ndb/src/mgmsrv/ConfigInfo.cpp

+7 −6
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ extern my_bool opt_core; 
#define MAX_LINE_LENGTH 255

#define KEY_INTERNAL 0

#define MAX_INT_RNIL 0xfffffeff

#define MAX_PORT_NO 65535



#define _STR_VALUE(x) #x

#define STR_VALUE(x) _STR_VALUE(x)
@@ -426,7 +427,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { 
    ConfigInfo::CI_INT,

    UNDEFINED,

    "1",

    STR_VALUE(MAX_INT_RNIL) },

    STR_VALUE(MAX_PORT_NO) },



  {

    CFG_DB_NO_REPLICAS,
@@ -1430,7 +1431,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { 
    ConfigInfo::CI_INT,

    NDB_PORT,

    "0",

    STR_VALUE(MAX_INT_RNIL) },

    STR_VALUE(MAX_PORT_NO) },



  {

    KEY_INTERNAL,
@@ -1442,7 +1443,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { 
    ConfigInfo::CI_INT,

    UNDEFINED,

    "0",

    STR_VALUE(MAX_INT_RNIL) },

    STR_VALUE(MAX_PORT_NO) },



  {

    CFG_NODE_ARBIT_RANK,
@@ -1573,7 +1574,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { 
    ConfigInfo::CI_INT,

    MANDATORY,

    "0",

    STR_VALUE(MAX_INT_RNIL) },

    STR_VALUE(MAX_PORT_NO) },



  {

    CFG_TCP_SEND_BUFFER_SIZE,
@@ -1679,7 +1680,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { 
    ConfigInfo::CI_INT,

    MANDATORY,

    "0", 

    STR_VALUE(MAX_INT_RNIL) },

    STR_VALUE(MAX_PORT_NO) },



  {

    CFG_SHM_SIGNUM,
@@ -1879,7 +1880,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { 
    ConfigInfo::CI_INT,

    MANDATORY,

    "0", 

    STR_VALUE(MAX_INT_RNIL) },

    STR_VALUE(MAX_PORT_NO) },



  {

    CFG_SCI_HOST1_ID_0,

ndb/test/ndbapi/testNodeRestart.cpp

+1 −0
Original line number Diff line number Diff line
@@ -294,6 +294,7 @@ int runRestarts(NDBT_Context* ctx, NDBT_Step* step){ 
    }    

    i++;

  }

  ctx->stopTest();

  return result;

}