Commit acd36295 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 9759d3c9 9e9f5fc2

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

+0 −4
Original line number Diff line number Diff line
@@ -359,9 +359,6 @@ void Cmvmi::execSTTOR(Signal* signal) 
    signal->theData[2] = NodeInfo::REP;

    execOPEN_COMREQ(signal);    

    globalData.theStartLevel = NodeState::SL_STARTED;

    sendSTTORRY(signal);

  } else {

    jam();



    if(theConfig.lockPagesInMainMemory()){

      int res = NdbMem_MemLockAll();
@@ -370,7 +367,6 @@ void Cmvmi::execSTTOR(Signal* signal) 
	warningEvent("Failed to memlock pages");

      }

    }

    

    sendSTTORRY(signal);

  }

}