Commit 89af4e7c authored by unknown's avatar unknown
Browse files

merge fix 


storage/ndb/src/kernel/SimBlockList.cpp:
  merge
storage/ndb/src/kernel/blocks/pgman.cpp:
  merge
parent a594818b

storage/ndb/src/kernel/SimBlockList.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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;

  {

storage/ndb/src/kernel/blocks/pgman.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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;