From f1722c76a02a4f5df64cdc36c9c119c611593c21 Mon Sep 17 00:00:00 2001
From: "jonas@perch.ndb.mysql.com" <>
Date: Fri, 1 Dec 2006 10:29:45 +0100
Subject: [PATCH] ndb -   fix merge error

---
 storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp b/storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
index f9607a2cb1..701682c426 100644
--- a/storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
+++ b/storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
@@ -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){
-- 
2.30.9