← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/join.cc

  • Committer: Olaf van der Spek
  • Date: 2011-02-18 11:31:55 UTC
  • mto: (2180.1.1 drizzle-staging)
  • mto: This revision was merged to the branch mainline in revision 2181.
  • Revision ID: olafvdspek@gmail.com-20110218113155-77lw3enup24hajvu
x

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/join.cc
2294
2294
    }
2295
2295
  }
2296
2296
 
2297
 
  List_iterator<Item> it(all_fields);
 
2297
  List<Item>::iterator it(all_fields);
2298
2298
  Item *item;
2299
2299
  while ((item= it++))
2300
2300
  {
2400
2400
    uint32_t pos= send_group_parts - level -1;
2401
2401
    bool real_fields= 0;
2402
2402
    Item *item;
2403
 
    List_iterator<Item> new_it(rollup.getFields()[pos]);
 
2403
    List<Item>::iterator new_it(rollup.getFields()[pos]);
2404
2404
    Item **ref_array_start= rollup.getRefPointerArrays()[pos];
2405
2405
    Order *start_group;
2406
2406
 
5596
5596
 
5597
5597
  /* Calculate how many saved fields there is in list */
5598
5598
  field_count=0;
5599
 
  List_iterator<Item> it(fields);
 
5599
  List<Item>::iterator it(fields);
5600
5600
  Item *item;
5601
5601
  while ((item=it++))
5602
5602
  {