diff options
| author | unknown <jonas@perch.ndb.mysql.com> | 2006-12-01 10:29:45 +0100 |
|---|---|---|
| committer | unknown <jonas@perch.ndb.mysql.com> | 2006-12-01 10:29:45 +0100 |
| commit | 1360c578540f2bd6ca20434ba2dff59e651bc190 (patch) | |
| tree | 528924b8185fd9595e6dc85000e08a4c1892c3c0 /storage | |
| parent | aeb2d457778a9fc8090cc206e8778271fbdd4e03 (diff) | |
| download | mariadb-git-1360c578540f2bd6ca20434ba2dff59e651bc190.tar.gz | |
ndb -
fix merge error
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
fix merge error
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp b/storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp index f9607a2cb19..701682c426e 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){ |