diff options
| author | evgen@sunlight.local <> | 2006-03-30 19:04:21 +0400 |
|---|---|---|
| committer | evgen@sunlight.local <> | 2006-03-30 19:04:21 +0400 |
| commit | 7e4535e2856d8dc6ef7f71ef66ea60c831c2771d (patch) | |
| tree | 284b62cd744fc44cd8e4f81e1c6b094372e5f31a /sql/item_sum.cc | |
| parent | eb075f2255b1135c062071dd632dcf20a8c5a45f (diff) | |
| download | mariadb-git-7e4535e2856d8dc6ef7f71ef66ea60c831c2771d.tar.gz | |
item_sum.cc, sql_select.cc:
After merge fix for bug#15560
item_sum.h:
After merge fix for bug#15560
Diffstat (limited to 'sql/item_sum.cc')
| -rw-r--r-- | sql/item_sum.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc index 4948e60b309..1cd1741cea6 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -3024,14 +3024,14 @@ Item_func_group_concat(Name_resolution_context *context_arg, bool distinct_arg, List<Item> *select_list, SQL_LIST *order_list, String *separator_arg) :tmp_table_param(0), warning(0), - force_copy_fields(0), separator(separator_arg), tree(0), table(0), + separator(separator_arg), tree(0), table(0), order(0), context(context_arg), arg_count_order(order_list ? order_list->elements : 0), arg_count_field(select_list->elements), count_cut_values(0), distinct(distinct_arg), warning_for_row(FALSE), - original(0) + force_copy_fields(0), original(0) { Item *item_select; Item **arg_ptr; @@ -3077,7 +3077,6 @@ Item_func_group_concat::Item_func_group_concat(THD *thd, :Item_sum(thd, item), tmp_table_param(item->tmp_table_param), warning(item->warning), - force_copy_fields(item->force_copy_fields), separator(item->separator), tree(item->tree), table(item->table), @@ -3089,6 +3088,7 @@ Item_func_group_concat::Item_func_group_concat(THD *thd, distinct(item->distinct), warning_for_row(item->warning_for_row), always_null(item->always_null), + force_copy_fields(item->force_copy_fields), original(item) { quick_group= item->quick_group; |