← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/cmpfunc.cc

  • Committer: Brian Aker
  • Date: 2011-02-18 16:48:57 UTC
  • mfrom: (2180.1.3 drizzle-staging)
  • Revision ID: brian@tangent.org-20110218164857-4n61en8wai9c91gi
Rollup all of Olaf's branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/cmpfunc.cc
3896
3896
Item_cond::fix_fields(Session *session, Item **)
3897
3897
{
3898
3898
  assert(fixed == 0);
3899
 
  List_iterator<Item> li(list);
 
3899
  List<Item>::iterator li(list);
3900
3900
  Item *item;
3901
3901
  void *orig_session_marker= session->session_marker;
3902
3902
  unsigned char buff[sizeof(char*)];                    // Max local vars in function
3936
3936
           !((Item_cond*) item)->list.is_empty())
3937
3937
    {                                           // Identical function
3938
3938
      li.replace(((Item_cond*) item)->list);
3939
 
      ((Item_cond*) item)->list.empty();
 
3939
      ((Item_cond*) item)->list.clear();
3940
3940
      item= *li.ref();                          // new current item
3941
3941
    }
3942
3942
    if (abort_on_null)
3972
3972
 
3973
3973
void Item_cond::fix_after_pullout(Select_Lex *new_parent, Item **)
3974
3974
{
3975
 
  List_iterator<Item> li(list);
 
3975
  List<Item>::iterator li(list);
3976
3976
  Item *item;
3977
3977
 
3978
3978
  used_tables_cache=0;
4033
4033
 
4034
4034
Item *Item_cond::transform(Item_transformer transformer, unsigned char *arg)
4035
4035
{
4036
 
  List_iterator<Item> li(list);
 
4036
  List<Item>::iterator li(list);
4037
4037
  Item *item;
4038
4038
  while ((item= li++))
4039
4039
  {
4084
4084
  if (!(this->*analyzer)(arg_p))
4085
4085
    return 0;
4086
4086
 
4087
 
  List_iterator<Item> li(list);
 
4087
  List<Item>::iterator li(list);
4088
4088
  Item *item;
4089
4089
  while ((item= li++))
4090
4090
  {
4103
4103
void Item_cond::traverse_cond(Cond_traverser traverser,
4104
4104
                              void *arg, traverse_order order)
4105
4105
{
4106
 
  List_iterator<Item> li(list);
 
4106
  List<Item>::iterator li(list);
4107
4107
  Item *item;
4108
4108
 
4109
4109
  switch (order) {
4144
4144
void Item_cond::split_sum_func(Session *session, Item **ref_pointer_array,
4145
4145
                               List<Item> &fields)
4146
4146
{
4147
 
  List_iterator<Item> li(list);
 
4147
  List<Item>::iterator li(list);
4148
4148
  Item *item;
4149
4149
  while ((item= li++))
4150
4150
    item->split_sum_func(session, ref_pointer_array,
4195
4195
 
4196
4196
void Item_cond::neg_arguments(Session *session)
4197
4197
{
4198
 
  List_iterator<Item> li(list);
 
4198
  List<Item>::iterator li(list);
4199
4199
  Item *item;
4200
4200
  while ((item= li++))          /* Apply not transformation to the arguments */
4201
4201
  {
4749
4749
int64_t Item_cond_xor::val_int()
4750
4750
{
4751
4751
  assert(fixed == 1);
4752
 
  List_iterator<Item> li(list);
 
4752
  List<Item>::iterator li(list);
4753
4753
  Item *item;
4754
4754
  int result=0;
4755
4755
  null_value=0;
5040
5040
void Item_equal::sort(Item_field_cmpfunc cmp, void *arg)
5041
5041
{
5042
5042
  bool swap;
5043
 
  List_iterator<Item_field> it(fields);
 
5043
  List<Item_field>::iterator it(fields);
5044
5044
  do
5045
5045
  {
5046
5046
    Item_field *item1= it++;
5064
5064
        ref1= ref2;
5065
5065
      }
5066
5066
    }
5067
 
    it.rewind();
 
5067
    it= fields;
5068
5068
  } while (swap);
5069
5069
}
5070
5070
 
5081
5081
 
5082
5082
void Item_equal::update_const()
5083
5083
{
5084
 
  List_iterator<Item_field> it(fields);
 
5084
  List<Item_field>::iterator it(fields);
5085
5085
  Item *item;
5086
5086
  while ((item= it++))
5087
5087
  {
5171
5171
 
5172
5172
Item *Item_equal::transform(Item_transformer transformer, unsigned char *arg)
5173
5173
{
5174
 
  List_iterator<Item_field> it(fields);
 
5174
  List<Item_field>::iterator it(fields);
5175
5175
  Item *item;
5176
5176
  while ((item= it++))
5177
5177
  {