Commit bb4c84e6 authored by unknown's avatar unknown
Browse files

Merge perch.ndb.mysql.com:/home/jonas/src/41-work 

into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
parents acd36295 55640f60

ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp

+10 −8
Original line number Diff line number Diff line
@@ -340,6 +340,16 @@ void Cmvmi::execSTTOR(Signal* signal) 
  jamEntry();

  if (theStartPhase == 1){

    jam();



    if(theConfig.lockPagesInMainMemory())

    {

      int res = NdbMem_MemLockAll();

      if(res != 0){

	g_eventLogger.warning("Failed to memlock pages");

	warningEvent("Failed to memlock pages");

      }

    }

    

    sendSTTORRY(signal);

    return;

  } else if (theStartPhase == 3) {
@@ -359,14 +369,6 @@ void Cmvmi::execSTTOR(Signal* signal) 
    signal->theData[2] = NodeInfo::REP;

    execOPEN_COMREQ(signal);    

    globalData.theStartLevel = NodeState::SL_STARTED;



    if(theConfig.lockPagesInMainMemory()){

      int res = NdbMem_MemLockAll();

      if(res != 0){

	g_eventLogger.warning("Failed to memlock pages");

	warningEvent("Failed to memlock pages");

      }

    }

    sendSTTORRY(signal);

  }

}