Commit 9ccbdc6b authored by unknown's avatar unknown
Browse files

remove compiler warnings

parent 8c391e7c

ndb/src/kernel/blocks/dbtux/DbtuxSearch.cpp

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ Dbtux::searchToAdd(Frag& frag, ConstData searchKey, TreeEnt searchEnt, TreePos& 
  treePos.m_loc = currNode.m_loc;

  // binary search

  int lo = -1;

  int hi = currNode.getOccup();

  unsigned hi = currNode.getOccup();

  int ret;

  while (1) {

    jam();

ndb/src/kernel/blocks/dbutil/DbUtil.cpp

+1 −0
Original line number Diff line number Diff line
@@ -1059,6 +1059,7 @@ DbUtil::prepareOperation(Signal* signal, PreparePtr prepPtr) 
      ndbrequire(prepPagesReader.getValueLen() <= MAX_ATTR_NAME_SIZE);

      

      prepPagesReader.getString(attrNameRequested);

      attrIdRequested= ~0u;

    } else {

      jam();

      attrIdRequested = prepPagesReader.getUint32();

ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp

+1 −1
Original line number Diff line number Diff line
@@ -37,9 +37,9 @@ void Ndbcntr::initRecords() 


Ndbcntr::Ndbcntr(const class Configuration & conf):

  SimulatedBlock(NDBCNTR, conf),

  c_stopRec(* this),

  cnoWaitrep6(0),

  cnoWaitrep7(0),

  c_stopRec(* this),

  c_missra(* this)

{

ndb/src/kernel/blocks/qmgr/QmgrMain.cpp

+7 −6
Original line number Diff line number Diff line
@@ -1760,8 +1760,8 @@ void Qmgr::execAPI_FAILCONF(Signal* signal) 
  } else {

    jam();

#ifdef VM_TRACE

    ndbout << "failedNodePtr.p->failState = " << failedNodePtr.p->failState

	   << endl;

    ndbout << "failedNodePtr.p->failState = "

	   << (Uint32)(failedNodePtr.p->failState) << endl;

#endif   

    systemErrorLab(signal);

  }//if
@@ -1932,10 +1932,6 @@ void Qmgr::execAPI_REGREQ(Signal* signal) 


  bool compatability_check;

  switch(getNodeInfo(apiNodePtr.i).getType()){

  case NodeInfo::DB:

  case NodeInfo::INVALID:

    sendApiRegRef(signal, ref, ApiRegRef::WrongType);

    return;

  case NodeInfo::API:

    compatability_check = ndbCompatible_ndb_api(NDB_VERSION, version);

    break;
@@ -1945,6 +1941,11 @@ void Qmgr::execAPI_REGREQ(Signal* signal) 
  case NodeInfo::REP:

    compatability_check = ndbCompatible_ndb_api(NDB_VERSION, version);

    break;

  case NodeInfo::DB:

  case NodeInfo::INVALID:

  default:

    sendApiRegRef(signal, ref, ApiRegRef::WrongType);

    return;

  }



  if (!compatability_check) {

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

+2 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ Suma::getNodeGroupMembers(Signal* signal) { 
  }



  //  ndbout_c("c_noNodesInGroup=%d", c_noNodesInGroup);

  ndbrequire(c_noNodesInGroup >= 0); // at least 1 node in the nodegroup

  ndbrequire(c_noNodesInGroup > 0); // at least 1 node in the nodegroup



#ifdef NODEFAIL_DEBUG

  for (Uint32 i = 0; i < c_noNodesInGroup; i++) {
@@ -2713,6 +2713,7 @@ Suma::getResponsibleSumaNodeId(Uint32 D) 
    id = RNIL;

  } else {

    jam();

    id = RNIL;

    const Uint32 n = c_noNodesInGroup; // Number nodes in node group

    const Uint32 C1 = D / n;

    const Uint32 C2 = D - C1*n; // = D % n;