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 | 51555d2ae3b8a27e8b08ae5a4634bd4519a217b9 (patch) | |
| tree | 5bd51666d56f778fdcccf91f137acc096e78d70a /sql/item_sum.h | |
| parent | 0fe3128c947ff938bd81d682cfb245926a4e808e (diff) | |
| parent | 2d83663380f5c0ea720e31f51898912b0006cd9f (diff) | |
| download | mariadb-git-51555d2ae3b8a27e8b08ae5a4634bd4519a217b9.tar.gz | |
Merge from 5.1 to 5.5
sql/sql_class.h:
Parsing for group_concat's order by is made independent.
As a result, add_order_to_list cannot be used anymore.
Diffstat (limited to 'sql/item_sum.h')
| -rw-r--r-- | sql/item_sum.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/item_sum.h b/sql/item_sum.h index a0b54b0ec8a..edcdb5a4d1e 100644 --- a/sql/item_sum.h +++ b/sql/item_sum.h @@ -1,7 +1,8 @@ #ifndef ITEM_SUM_INCLUDED #define ITEM_SUM_INCLUDED -/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights + reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -1402,7 +1403,7 @@ class Item_func_group_concat : public Item_sum public: Item_func_group_concat(Name_resolution_context *context_arg, bool is_distinct, List<Item> *is_select, - SQL_I_List<ORDER> *is_order, String *is_separator); + const SQL_I_List<ORDER> &is_order, String *is_separator); Item_func_group_concat(THD *thd, Item_func_group_concat *item); ~Item_func_group_concat(); |