← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/optimizer/range.cc

  • Committer: Lee Bieber
  • Date: 2011-02-23 17:17:54 UTC
  • mfrom: (2194.1.3 build)
  • Revision ID: kalebral@gmail.com-20110223171754-5g62btbvgtzsev3n
Merge Stewart - 676770: Error log logging 'Sort aborted' messages when DML fails with ER_INVALID_ENUM_VALUE     
Merge Olaf - Use Item_equal::begin() and Use List::size()
Merge Olaf - Delete drizzled/strfunc.h

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/optimizer/range.cc
2534
2534
  Item_equal *item_equal= field_item->item_equal;
2535
2535
  if (item_equal)
2536
2536
  {
2537
 
    Item_equal_iterator it(*item_equal);
 
2537
    Item_equal_iterator it(item_equal->begin());
2538
2538
    Item_field *item;
2539
2539
    while ((item= it++))
2540
2540
    {
2689
2689
    Item_equal *item_equal= (Item_equal *) cond;
2690
2690
    if (!(value= item_equal->get_const()))
2691
2691
      return 0;
2692
 
    Item_equal_iterator it(*item_equal);
 
2692
    Item_equal_iterator it(item_equal->begin());
2693
2693
    ref_tables= value->used_tables();
2694
2694
    while ((field_item= it++))
2695
2695
    {
3116
3116
               (value->val_int() < 0))
3117
3117
        type = Item_func::GE_FUNC;
3118
3118
    }
 
3119
    else if (err == 1)
 
3120
    {
 
3121
      tree= new (alloc) optimizer::SEL_ARG(field, 0, 0);
 
3122
      tree->type= optimizer::SEL_ARG::IMPOSSIBLE;
 
3123
      goto end;
 
3124
    }
3119
3125
  }
3120
3126
  else if (err < 0)
3121
3127
  {