← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item_row.cc

  • Committer: Brian Aker
  • Date: 2008-10-20 04:28:21 UTC
  • mto: (492.3.21 drizzle-clean-code)
  • mto: This revision was merged to the branch mainline in revision 530.
  • Revision ID: brian@tangent.org-20081020042821-rqqdrccuu8195k3y
Second pass of thd cleanup

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item_row.cc
55
55
  return;
56
56
}
57
57
 
58
 
bool Item_row::fix_fields(Session *thd, Item **ref __attribute__((unused)))
 
58
bool Item_row::fix_fields(Session *session, Item **ref __attribute__((unused)))
59
59
{
60
60
  assert(fixed == 0);
61
61
  null_value= 0;
63
63
  Item **arg, **arg_end;
64
64
  for (arg= items, arg_end= items+arg_count; arg != arg_end ; arg++)
65
65
  {
66
 
    if ((*arg)->fix_fields(thd, arg))
 
66
    if ((*arg)->fix_fields(session, arg))
67
67
      return true;
68
68
    // we can't assign 'item' before, because fix_fields() can change arg
69
69
    Item *item= *arg;
99
99
}
100
100
 
101
101
 
102
 
void Item_row::split_sum_func(Session *thd, Item **ref_pointer_array,
 
102
void Item_row::split_sum_func(Session *session, Item **ref_pointer_array,
103
103
                              List<Item> &fields)
104
104
{
105
105
  Item **arg, **arg_end;
106
106
  for (arg= items, arg_end= items+arg_count; arg != arg_end ; arg++)
107
 
    (*arg)->split_sum_func2(thd, ref_pointer_array, fields, arg, true);
 
107
    (*arg)->split_sum_func2(session, ref_pointer_array, fields, arg, true);
108
108
}
109
109
 
110
110
 
182
182
      change records at each execution.
183
183
    */
184
184
    if (items[i] != new_item)
185
 
      current_thd->change_item_tree(&items[i], new_item);
 
185
      current_session->change_item_tree(&items[i], new_item);
186
186
  }
187
187
  return (this->*transformer)(arg);
188
188
}