← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/function/str/make_set.cc

Reverted changes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/str/make_set.cc
34
34
}
35
35
 
36
36
 
37
 
void Item_func_make_set::split_sum_func(Session *session, Item **ref_pointer_array,
 
37
void Item_func_make_set::split_sum_func(Session *session_arg, Item **ref_pointer_array,
38
38
                                        List<Item> &fields)
39
39
{
40
 
  item->split_sum_func(session, ref_pointer_array, fields, &item, true);
41
 
  Item_str_func::split_sum_func(session, ref_pointer_array, fields);
 
40
  item->split_sum_func(session_arg, ref_pointer_array, fields, &item, true);
 
41
  Item_str_func::split_sum_func(session_arg, ref_pointer_array, fields);
42
42
}
43
43
 
44
44
 
124
124
    change records at each execution.
125
125
  */
126
126
  if (item != new_item)
127
 
    current_session->change_item_tree(&item, new_item);
 
127
    session.change_item_tree(&item, new_item);
 
128
 
128
129
  return Item_str_func::transform(transformer, arg);
129
130
}
130
131