Commit b0232826 authored by unknown's avatar unknown

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

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new

parents 79e26c1f 9b0dcd41
No related merge requests found
......@@ -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;
{
......
......@@ -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;
};
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment