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 | db2fe44c844e969405095220287ea98a57f33284 (patch) | |
| tree | 7aee99151209c7e83d2cf2ec0b242e6827f8c55f /sql/item_sum.h | |
| parent | 90343dd788471cbc384f7f11b7d48fc474ece4c5 (diff) | |
| parent | 0f9ddfa9d8bb8d071266bcc63e92813cf18ccd2b (diff) | |
| download | mariadb-git-db2fe44c844e969405095220287ea98a57f33284.tar.gz | |
Merge of mysql-5.1-bugteam into mysql-trunk-merge.
Diffstat (limited to 'sql/item_sum.h')
| -rw-r--r-- | sql/item_sum.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_sum.h b/sql/item_sum.h index 99fcb14d160..b4539995632 100644 --- a/sql/item_sum.h +++ b/sql/item_sum.h @@ -1375,7 +1375,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_LIST *is_order, String *is_separator); + SQL_I_List<ORDER> *is_order, String *is_separator); Item_func_group_concat(THD *thd, Item_func_group_concat *item); ~Item_func_group_concat(); |