← 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-08-17 19:14:47 UTC
  • mfrom: (2385.3.17 rf)
  • Revision ID: me@mark.atwood.name-20110817191447-h86yzddvycd0xmof
merge lp:~olafvdspek/drizzle/refactor6

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/optimizer/quick_ror_intersect_select.cc
87
87
 
88
88
int optimizer::QuickRorIntersectSelect::init_ror_merged_scan(bool reuse_handler)
89
89
{
90
 
  vector<optimizer::QuickRangeSelect *>::iterator it= quick_selects.begin();
 
90
  vector<optimizer::QuickRangeSelect*>::iterator it= quick_selects.begin();
91
91
 
92
92
  /* Initialize all merged "children" quick selects */
93
93
  assert(! need_to_fetch_row || reuse_handler);
94
 
  if (! need_to_fetch_row && reuse_handler)
 
94
  if (not need_to_fetch_row && reuse_handler)
95
95
  {
96
96
    optimizer::QuickRangeSelect *quick= *it;
97
97
    ++it;