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/sql_class.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/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 99420ed0dd8..093758ce389 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -3673,6 +3673,11 @@ inline bool add_order_to_list(THD *thd, Item *item, bool asc) return thd->lex->current_select->add_order_to_list(thd, item, asc); } +inline bool add_gorder_to_list(THD *thd, Item *item, bool asc) +{ + return thd->lex->current_select->add_gorder_to_list(thd, item, asc); +} + inline bool add_group_to_list(THD *thd, Item *item, bool asc) { return thd->lex->current_select->add_group_to_list(thd, item, asc); |