← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/optimizer/range.cc

updating

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/optimizer/range.cc
840
840
        optimizer::SEL_IMERGE *imerge= NULL;
841
841
        optimizer::TableReadPlan *best_conj_trp= NULL;
842
842
        optimizer::TableReadPlan *new_conj_trp= NULL;
843
 
        List_iterator_fast<optimizer::SEL_IMERGE> it(tree->merges);
 
843
        List<optimizer::SEL_IMERGE>::iterator it(tree->merges);
844
844
        while ((imerge= it++))
845
845
        {
846
846
          new_conj_trp= get_best_disjunct_quick(session, &param, imerge, best_read_time);
4755
4755
    */
4756
4756
    else if (join->select_distinct)
4757
4757
    {
4758
 
      select_items_it= join->fields_list;
 
4758
      select_items_it= join->fields_list.begin();
4759
4759
      used_key_parts_map.reset();
4760
4760
      uint32_t max_key_part= 0;
4761
4761
      while ((item= select_items_it++))
5036
5036
  Item::Type cond_type= cond->type();
5037
5037
  if (cond_type == Item::COND_ITEM) /* 'AND' or 'OR' */
5038
5038
  {
5039
 
    List_iterator_fast<Item> li(*((Item_cond*) cond)->argument_list());
 
5039
    List<Item>::iterator li(*((Item_cond*) cond)->argument_list());
5040
5040
    Item *and_or_arg= NULL;
5041
5041
    while ((and_or_arg= li++))
5042
5042
    {