diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-07-16 19:09:54 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-07-16 19:09:54 +0200 |
| commit | 005c7e54214546584c8dc67a746e215f8dbe4b58 (patch) | |
| tree | dea50cd7b32808413e058d43d20cf230d1cc7477 /sql/item_sum.h | |
| parent | b9f220b45afaae9b61af29129a8c8ec5f9a7759b (diff) | |
| parent | 4f5c10e6b565bc2761b9d083e25c6a36141552a0 (diff) | |
| download | mariadb-git-005c7e54214546584c8dc67a746e215f8dbe4b58.tar.gz | |
mysql-5.5.32 merge
Diffstat (limited to 'sql/item_sum.h')
| -rw-r--r-- | sql/item_sum.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/item_sum.h b/sql/item_sum.h index a954b0f65c1..27748d214dd 100644 --- a/sql/item_sum.h +++ b/sql/item_sum.h @@ -1,7 +1,7 @@ #ifndef ITEM_SUM_INCLUDED #define ITEM_SUM_INCLUDED -/* Copyright (c) 2000, 2011 Oracle and/or its affiliates. - Copyright (c) 2008-2011 Monty Program Ab +/* Copyright (c) 2000, 2013 Oracle and/or its affiliates. + Copyright (c) 2008, 2013 Monty Program Ab. 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 @@ -1428,7 +1428,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(); |