← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/optimizer/sel_tree.cc

  • Committer: Olaf van der Spek
  • Date: 2011-06-22 18:29:16 UTC
  • mto: This revision was merged to the branch mainline in revision 2347.
  • Revision ID: olafvdspek@gmail.com-20110622182916-6t109xy9j7v41mhk
Refactor

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/optimizer/sel_tree.cc
99
99
                               List<optimizer::SEL_IMERGE> *im1,
100
100
                               optimizer::SEL_TREE *tree)
101
101
{
102
 
  optimizer::SEL_IMERGE *imerge= NULL;
103
102
  List_iterator<optimizer::SEL_IMERGE> it(im1->begin());
104
 
  while ((imerge= it++))
 
103
  while (optimizer::SEL_IMERGE* imerge= it++)
105
104
  {
106
 
    if (imerge->or_sel_tree_with_checks(param, tree))
 
105
    if (imerge->or_sel_tree_with_checks(*param, *tree))
107
106
      it.remove();
108
107
  }
109
108
  return im1->is_empty();