← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/optimizer/sum.cc

  • Committer: Lee Bieber
  • Date: 2011-02-20 02:08:06 UTC
  • mfrom: (2183.2.3 list)
  • Revision ID: kalebral@gmail.com-20110220020806-ad95ldlm2rfahrrr
Merge Olaf - change List_iterator_fast to List<Item>::iterator

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/optimizer/sum.cc
114
114
 
115
115
int optimizer::sum_query(TableList *tables, List<Item> &all_fields, COND *conds)
116
116
{
117
 
  List_iterator_fast<Item> it(all_fields);
 
117
  List<Item>::iterator it(all_fields);
118
118
  int const_result= 1;
119
119
  bool recalc_const_item= false;
120
120
  uint64_t count= 1;
689
689
    }
690
690
 
691
691
    /* AND */
692
 
    List_iterator_fast<Item> li(*((Item_cond*) cond)->argument_list());
 
692
    List<Item>::iterator li(*((Item_cond*) cond)->argument_list());
693
693
    Item *item;
694
694
    while ((item= li++))
695
695
    {
1071
1071
  /* If AND/OR condition */
1072
1072
  if (cond->type() == Item::COND_ITEM)
1073
1073
  {
1074
 
    List_iterator_fast<Item> li(*((Item_cond*) cond)->argument_list());
 
1074
    List<Item>::iterator li(*((Item_cond*) cond)->argument_list());
1075
1075
    Item *item;
1076
1076
    while ((item= li++))
1077
1077
    {