← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_select.cc

  • Committer: Brian Aker
  • Date: 2011-02-24 19:58:57 UTC
  • mfrom: (2183.2.25 list2)
  • mto: This revision was merged to the branch mainline in revision 2199.
  • Revision ID: brian@tangent.org-20110224195857-24p1kalw92bmco2n
More list

Show diffs side-by-side

added added

removed removed

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