~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/optimizer/quick_ror_intersect_select.cc

  • Committer: Olaf van der Spek
  • Date: 2011-06-22 14:19:44 UTC
  • mto: This revision was merged to the branch mainline in revision 2347.
  • Revision ID: olafvdspek@gmail.com-20110622141944-na0vb0uv30n6u55z
Refactor

Show diffs side-by-side

added added

removed removed

Lines of Context:
58
58
 
59
59
  if (parent_alloc)
60
60
  {
61
 
    last_rowid= (unsigned char*) parent_alloc->alloc_root(head->cursor->ref_length);
 
61
    last_rowid= (unsigned char*) parent_alloc->alloc(head->cursor->ref_length);
62
62
  }
63
63
  else
64
64
  {
65
 
    last_rowid= (unsigned char*) alloc.alloc_root(head->cursor->ref_length);
 
65
    last_rowid= (unsigned char*) alloc.alloc(head->cursor->ref_length);
66
66
  }
67
67
}
68
68