← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

  • Committer: Brian Aker
  • Date: 2010-05-26 21:49:18 UTC
  • mto: This revision was merged to the branch mainline in revision 1568.
  • Revision ID: brian@gaz-20100526214918-8kdibq48e9lnyr6t
https://launchpad.net/bugs/586009
This fixes bug 586009, increases the size of the log files so that the UNION
test doesn't hit Innodb's default limit. Increases the size of the initial
Innodb data file, and fixes one case where an empty string on error was
causing a crash on OSX.

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_arg, Item **ref_pointer_array,
 
37
void Item_func_make_set::split_sum_func(Session *session, Item **ref_pointer_array,
38
38
                                        List<Item> &fields)
39
39
{
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);
 
40
  item->split_sum_func(session, ref_pointer_array, fields, &item, true);
 
41
  Item_str_func::split_sum_func(session, 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
 
    session.change_item_tree(&item, new_item);
128
 
 
 
127
    current_session->change_item_tree(&item, new_item);
129
128
  return Item_str_func::transform(transformer, arg);
130
129
}
131
130