Skip to content

M
MariaDB
Commit 1360c578 authored by unknown's avatar unknown
Browse files
Options

ndb - 

  fix merge error


storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  fix merge error
parent aeb2d457
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
View file @ 1360c578
...@@ -367,7 +367,7 @@ void Cmvmi::execSTTOR(Signal* signal) ...@@ -367,7 +367,7 @@ void Cmvmi::execSTTOR(Signal* signal)
if (theStartPhase == 1){ if (theStartPhase == 1){
jam(); jam();
if(theConfig.lockPagesInMainMemory()) if(m_ctx.m_config.lockPagesInMainMemory())
{ {
int res = NdbMem_MemLockAll(); int res = NdbMem_MemLockAll();
if(res != 0){ if(res != 0){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7