← 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

  • Committer: Mark Atwood
  • Date: 2011-06-22 20:04:22 UTC
  • mfrom: (2318.6.39 rf)
  • Revision ID: me@mark.atwood.name-20110622200422-609npl456o0e5p32
merge lp:~olafvdspek/drizzle/refactor13

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/optimizer/quick_ror_intersect_select.cc
49
49
  record= head->record[0];
50
50
  if (! parent_alloc)
51
51
  {
52
 
    memory::init_sql_alloc(&alloc, session->variables.range_alloc_block_size, 0);
 
52
    alloc.init(session->variables.range_alloc_block_size);
53
53
  }
54
54
  else
55
55
  {