mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 11:31:51 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge fix

Browse source
This commit is contained in:
jonas@perch.ndb.mysql.com 2006-03-01 11:30:32 +01:00
parent 9afb736735
commit 46ee3cb804
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
storage/ndb/src/kernel/SimBlockList.cpp
View file

@ -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;
{

4
storage/ndb/src/kernel/blocks/pgman.cpp
View file

@ -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;