summaryrefslogtreecommitdiff
path: root/ndb
diff options
context:
space:
mode:
authorunknown <jonas@perch.ndb.mysql.com>2006-11-22 14:05:40 +0100
committerunknown <jonas@perch.ndb.mysql.com>2006-11-22 14:05:40 +0100
commit9e9f5fc2ce5ec25bb968c54c5b846ca01055a428 (patch)
tree56e18c51cc5befd26dfd970143322a92748f6c8a /ndb
parentc893cb4ffbeda60ac2b2552be51f32a944ed33ab (diff)
downloadmariadb-git-9e9f5fc2ce5ec25bb968c54c5b846ca01055a428.tar.gz
ndb - bug#24461 - LockPagesInMemory ignored
actually do run mlockall ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp: actually do run mlockall
Diffstat (limited to 'ndb')
-rw-r--r--ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp4
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 f9290a75afb..fde73b4e22a 100644
--- a/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
+++ b/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
@@ -330,9 +330,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();
@@ -341,7 +338,6 @@ void Cmvmi::execSTTOR(Signal* signal)
warningEvent("Failed to memlock pages");
}
}
-
sendSTTORRY(signal);
}
}