← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/join.cc

  • Committer: David Shrewsbury
  • Date: 2011-02-20 17:06:25 UTC
  • mfrom: (2186 build)
  • mto: (2207.1.1 build)
  • mto: This revision was merged to the branch mainline in revision 2202.
  • Revision ID: shrewsbury.dave@gmail.com-20110220170625-kzi6llkbs9vxqh15
Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/join.cc
2213
2213
                              bool before_group_by, 
2214
2214
                              bool recompute)
2215
2215
{
2216
 
  List_iterator_fast<Item> it(field_list);
 
2216
  List<Item>::iterator it(field_list);
2217
2217
  Item_sum **func;
2218
2218
  Item *item;
2219
2219
 
2369
2369
*/
2370
2370
bool Join::rollup_make_fields(List<Item> &fields_arg, List<Item> &sel_fields, Item_sum ***func)
2371
2371
{
2372
 
  List_iterator_fast<Item> it(fields_arg);
 
2372
  List<Item>::iterator it(fields_arg);
2373
2373
  Item *first_field= sel_fields.head();
2374
2374
  uint32_t level;
2375
2375
 
2549
2549
    {
2550
2550
      int write_error;
2551
2551
      Item *item;
2552
 
      List_iterator_fast<Item> it(rollup.getFields()[i]);
 
2552
      List<Item>::iterator it(rollup.getFields()[i]);
2553
2553
      while ((item= it++))
2554
2554
      {
2555
2555
        if (item->type() == Item::NULL_ITEM && item->is_result_field())
5292
5292
  {
5293
5293
    if (send_row)
5294
5294
    {
5295
 
      List_iterator_fast<Item> it(fields);
 
5295
      List<Item>::iterator it(fields);
5296
5296
      Item *item;
5297
5297
      while ((item= it++))
5298
5298
        item->no_rows_in_result();
5566
5566
    Flatten nested joins that can be flattened.
5567
5567
    no ON expression and not a semi-join => can be flattened.
5568
5568
  */
5569
 
  li= *join_list;
 
5569
  li= join_list->begin();
5570
5570
  while ((table= li++))
5571
5571
  {
5572
5572
    nested_join= table->getNestedJoin();