From: Date: November 22 2006 2:05pm
Subject: bk commit into 4.1 tree (jonas:1.2559) BUG#24461
List-Archive: http://lists.mysql.com/commits/15700
X-Bug: 24461
Message-Id: <20061122130543.4B1E85ECC75@perch.ndb.mysql.com>

Below is the list of changes that have just been committed into a local
4.1 repository of jonas. When jonas 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@stripped, 2006-11-22 14:05:40+01:00, jonas@stripped +1 -0
  ndb - bug#24461 - LockPagesInMemory ignored
    actually do run mlockall

  ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp@stripped, 2006-11-22 14:05:39+01:00, jonas@stripped +0 -4
    actually do run mlockall

# 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:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/41-work

--- 1.21/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp	2006-11-22 14:05:43 +01:00
+++ 1.22/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp	2006-11-22 14:05:43 +01:00
@@ -330,9 +330,6 @@
     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 @@
 	warningEvent("Failed to memlock pages");
       }
     }
-    
     sendSTTORRY(signal);
   }
 }