← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_select.cc

  • Committer: Olaf van der Spek
  • Date: 2011-02-23 15:52:28 UTC
  • mto: (2198.2.3 drizzle-staging)
  • mto: This revision was merged to the branch mainline in revision 2199.
  • Revision ID: olafvdspek@gmail.com-20110223155228-9d8k16dqdnxmc1sl
Use List::front()

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_select.cc
2181
2181
   }
2182
2182
  }
2183
2183
 
2184
 
  if (!cond && !eq_list.head())
 
2184
  if (!cond && !&eq_list.front())
2185
2185
  {
2186
2186
    if (!eq_item)
2187
2187
      return new Item_int((int64_t) 1,1);
2290
2290
  {
2291
2291
    item_equal= (Item_equal *) cond;
2292
2292
    item_equal->sort(&compare_fields_by_table_order, table_join_idx);
2293
 
    if (cond_equal && cond_equal->current_level.head() == item_equal)
 
2293
    if (cond_equal && &cond_equal->current_level.front() == item_equal)
2294
2294
      cond_equal= 0;
2295
2295
    return eliminate_item_equal(0, cond_equal, item_equal);
2296
2296
  }
2465
2465
      {
2466
2466
        li.remove();
2467
2467
        if (cnd->argument_list()->size() == 1)
2468
 
          return cnd->argument_list()->head();
 
2468
          return &cnd->argument_list()->front();
2469
2469
        return conds;
2470
2470
      }
2471
2471
    }
2768
2768
    if (((Item_cond*) cond)->argument_list()->size() == 1)
2769
2769
    {                                           
2770
2770
      /* Argument list contains only one element, so reduce it so a single item, then remove list */
2771
 
      item= ((Item_cond*) cond)->argument_list()->head();
 
2771
      item= &((Item_cond*) cond)->argument_list()->front();
2772
2772
      ((Item_cond*) cond)->argument_list()->clear();
2773
2773
      return item;
2774
2774
    }
4072
4072
        case 0:
4073
4073
          return (COND*) 0;                     // Always true
4074
4074
        case 1:
4075
 
          return new_cond->argument_list()->head();
 
4075
          return &new_cond->argument_list()->front();
4076
4076
        default:
4077
4077
          /*
4078
4078
            Item_cond_and do not need fix_fields for execution, its parameters