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

Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new

Browse source 
into lmy004.:/work/mysql-5.1-bug16406
This commit is contained in:
unknown 2006-02-16 14:53:37 +01:00
commit 5e98e21a6e
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -78,8 +78,7 @@ SimBlockList::load(Configuration & conf){
Lgman* lg = 0;
Tsman* ts = 0;
Block_context ctx =
{ conf, * (Ndbd_mem_manager*)0 };
Block_context ctx(conf, * (Ndbd_mem_manager*)0);
SimulatedBlock * fs = 0;
{

2
storage/ndb/src/kernel/vm/SimulatedBlock.hpp
View file

@ -77,6 +77,8 @@ typedef struct NewVar
struct Block_context
{
Block_context(class Configuration& cfg, class Ndbd_mem_manager& mm)
: m_config(cfg), m_mm(mm) {}
class Configuration& m_config;
class Ndbd_mem_manager& m_mm;
};