Commit 1360c578 authored by unknown's avatar unknown
Browse files

ndb - 

  fix merge error


storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  fix merge error
parent aeb2d457

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

+1 −1
Original line number Diff line number Diff line
@@ -367,7 +367,7 @@ void Cmvmi::execSTTOR(Signal* signal) 
  if (theStartPhase == 1){

    jam();



    if(theConfig.lockPagesInMainMemory())

    if(m_ctx.m_config.lockPagesInMainMemory())

    {

      int res = NdbMem_MemLockAll();

      if(res != 0){