bk commit into 5.1 tree (tomas:1.2082) BUG#24461

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2082 07/01/04 12:22:31 tomas@poseidon. +1 -0
    ndb - bug#24461 - LockPagesInMemory ignored
    actually do run mlockall
    move mlock to much earlier in startphases
      not to affect heartbeats
  

  storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
    1.28 07/01/04 12:22:26 tomas@poseidon. +10 -12
      ndb - bug#24461 - LockPagesInMemory ignored
      actually do run mlockall
      move mlock to much earlier in startphases
        not to affect heartbeats
    

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	tomas
# Host:	poseidon.
# Root:	/home/tomas/mysql-5.1-wl2325-5.0

--- 1.27/storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp	2006-06-12 13:16:50 +02:00
+++ 1.28/storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp	2007-01-04 12:22:26 +01:00
@@ -339,6 +339,16 @@
   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) {
@@ -354,18 +364,6 @@
     signal->theData[2] = NodeInfo::API;
     execOPEN_COMREQ(signal);
     globalData.theStartLevel = NodeState::SL_STARTED;
-    sendSTTORRY(signal);
-  } else {
-    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);
   }
 }