← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/optimizer/quick_group_min_max_select.cc

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/optimizer/quick_group_min_max_select.cc
47
47
                       ha_rows records_arg,
48
48
                       uint32_t key_infix_len_arg,
49
49
                       unsigned char *key_infix_arg,
50
 
                       MEM_ROOT *parent_alloc)
 
50
                       memory::Root *parent_alloc)
51
51
  :
52
52
    join(join_arg),
53
53
    index_info(index_info_arg),
82
82
  assert(! parent_alloc);
83
83
  if (! parent_alloc)
84
84
  {
85
 
    init_sql_alloc(&alloc, join->session->variables.range_alloc_block_size, 0);
 
85
    memory::init_sql_alloc(&alloc, join->session->variables.range_alloc_block_size, 0);
86
86
    join->session->mem_root= &alloc;
87
87
  }
88
88
  else
89
 
    memset(&alloc, 0, sizeof(MEM_ROOT));  // ensure that it's not used
 
89
    memset(&alloc, 0, sizeof(memory::Root));  // ensure that it's not used
90
90
}
91
91
 
92
92