diff options
Diffstat (limited to 'storage/ndb/src')
| -rw-r--r-- | storage/ndb/src/kernel/SimBlockList.cpp | 2 | ||||
| -rw-r--r-- | storage/ndb/src/kernel/blocks/pgman.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/storage/ndb/src/kernel/SimBlockList.cpp b/storage/ndb/src/kernel/SimBlockList.cpp index 785be12a235..00ec5e4b006 100644 --- a/storage/ndb/src/kernel/SimBlockList.cpp +++ b/storage/ndb/src/kernel/SimBlockList.cpp @@ -79,7 +79,7 @@ SimBlockList::load(EmulatorData& data){ Lgman* lg = 0; Tsman* ts = 0; - Block_context ctx(conf, *data.m_mem_manager); + Block_context ctx(*data.theConfiguration, *data.m_mem_manager); SimulatedBlock * fs = 0; { diff --git a/storage/ndb/src/kernel/blocks/pgman.cpp b/storage/ndb/src/kernel/blocks/pgman.cpp index fb47a16665d..0d192ae6ede 100644 --- a/storage/ndb/src/kernel/blocks/pgman.cpp +++ b/storage/ndb/src/kernel/blocks/pgman.cpp @@ -2172,8 +2172,8 @@ operator<<(NdbOut& out, Ptr<Pgman::Page_entry> ptr) out << " busy_count=" << dec << pe.m_busy_count; #ifdef VM_TRACE { - Local_page_request_list req_list(ptr.p->m_this->m_page_request_pool, - ptr.p->m_requests); + Pgman::Local_page_request_list + req_list(ptr.p->m_this->m_page_request_pool, ptr.p->m_requests); if (! req_list.isEmpty()) { Ptr<Pgman::Page_request> req_ptr; |