diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-06-10 22:30:49 -0300 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-06-10 22:30:49 -0300 |
| commit | d6e003545adb73c2d653ec4c9e17d4695dcfc12a (patch) | |
| tree | 7aee99151209c7e83d2cf2ec0b242e6827f8c55f /sql/item_sum.cc | |
| parent | 222076528d1dc7dc4462787409f4107ab13bf5b2 (diff) | |
| parent | 53b8829682307224a8b5a9de814019926eea9bd7 (diff) | |
| download | mariadb-git-d6e003545adb73c2d653ec4c9e17d4695dcfc12a.tar.gz | |
Merge of mysql-5.1-bugteam into mysql-trunk-merge.
Diffstat (limited to 'sql/item_sum.cc')
| -rw-r--r-- | sql/item_sum.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc index 15927c4b11e..77c45ea85f7 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -2995,7 +2995,7 @@ 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_LIST *order_list, String *separator_arg) + 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), @@ -3039,7 +3039,7 @@ Item_func_group_concat(Name_resolution_context *context_arg, if (arg_count_order) { ORDER **order_ptr= order; - for (ORDER *order_item= (ORDER*) order_list->first; + for (ORDER *order_item= order_list->first; order_item != NULL; order_item= order_item->next) { |