diff options
| author | Chaithra Gopalareddy <chaithra.gopalareddy@oracle.com> | 2013-04-14 08:09:56 +0530 |
|---|---|---|
| committer | Chaithra Gopalareddy <chaithra.gopalareddy@oracle.com> | 2013-04-14 08:09:56 +0530 |
| commit | fcb0ecfae344837aa5de0f2e54ea43a967961d40 (patch) | |
| tree | 5bd51666d56f778fdcccf91f137acc096e78d70a /sql/item_sum.cc | |
| parent | 40360f0259228732991eacecbd5a0866aa72ec0a (diff) | |
| parent | 4db726c0fa37ae57054a1b2530a83c278b33f538 (diff) | |
| download | mariadb-git-fcb0ecfae344837aa5de0f2e54ea43a967961d40.tar.gz | |
Merge from 5.1 to 5.5
Diffstat (limited to 'sql/item_sum.cc')
| -rw-r--r-- | sql/item_sum.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc index 1f7a8a1c423..e194907fa06 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -3009,11 +3009,12 @@ int dump_leaf_key(void* key_arg, element_count count __attribute__((unused)), Item_func_group_concat:: Item_func_group_concat(Name_resolution_context *context_arg, bool distinct_arg, List<Item> *select_list, - SQL_I_List<ORDER> *order_list, String *separator_arg) + const SQL_I_List<ORDER> &order_list, + String *separator_arg) :tmp_table_param(0), separator(separator_arg), tree(0), unique_filter(NULL), table(0), order(0), context(context_arg), - arg_count_order(order_list ? order_list->elements : 0), + arg_count_order(order_list.elements), arg_count_field(select_list->elements), row_count(0), distinct(distinct_arg), @@ -3053,7 +3054,7 @@ Item_func_group_concat(Name_resolution_context *context_arg, if (arg_count_order) { ORDER **order_ptr= order; - for (ORDER *order_item= order_list->first; + for (ORDER *order_item= order_list.first; order_item != NULL; order_item= order_item->next) { |