← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/optimizer/quick_ror_intersect_select.cc

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/optimizer/quick_ror_intersect_select.cc
34
34
optimizer::QuickRorIntersectSelect::QuickRorIntersectSelect(Session *session_param,
35
35
                                                            Table *table,
36
36
                                                            bool retrieve_full_rows,
37
 
                                                            MEM_ROOT *parent_alloc)
 
37
                                                            memory::Root *parent_alloc)
38
38
  :
39
39
    cpk_quick(NULL),
40
40
    session(session_param),
46
46
  record= head->record[0];
47
47
  if (! parent_alloc)
48
48
  {
49
 
    init_sql_alloc(&alloc, session->variables.range_alloc_block_size, 0);
 
49
    memory::init_sql_alloc(&alloc, session->variables.range_alloc_block_size, 0);
50
50
  }
51
51
  else
52
52
  {
53
 
    memset(&alloc, 0, sizeof(MEM_ROOT));
 
53
    memset(&alloc, 0, sizeof(memory::Root));
54
54
  }
55
55
  last_rowid= (unsigned char*) alloc_root(parent_alloc ? parent_alloc : &alloc,
56
56
                                          head->cursor->ref_length);