ndb -

fix merge error

ndb -
fix merge error
f1722c76 · jonas@perch.ndb.mysql.com · b20c6e69 · f1722c76
Commit f1722c76 authored Dec 01, 2006 by jonas@perch.ndb.mysql.com
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp +1 -1

No files found.
--- 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){