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

1 files changed, 0 insertions, 4 deletions

diff --git a/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp b/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
index d2f9150ade0..8c8d60469a9 100644
--- a/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
+++ b/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
@@ -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);
   }
 }