diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-01-24 12:29:31 +0200 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-01-24 12:29:31 +0200 |
| commit | d833bb65d53b9a4375fa71cc485b4719fdb0ee53 (patch) | |
| tree | d1271339e1c3a660e4788a5c9913bfe54e0271f1 /sql/sql_select.h | |
| parent | e431d90065d277e62fa4f81a1654790f58a84146 (diff) | |
| parent | 76577e1e2602f3c30859a176808c433a263e1b0a (diff) | |
| download | mariadb-git-d833bb65d53b9a4375fa71cc485b4719fdb0ee53.tar.gz | |
Merge remote-tracking branch '5.5' into 10.0
Diffstat (limited to 'sql/sql_select.h')
| -rw-r--r-- | sql/sql_select.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_select.h b/sql/sql_select.h index 4f1b7bd7e05..f000ce3ba74 100644 --- a/sql/sql_select.h +++ b/sql/sql_select.h @@ -1770,7 +1770,7 @@ int get_quick_record(SQL_SELECT *select); SORT_FIELD * make_unireg_sortorder(ORDER *order, uint *length, SORT_FIELD *sortorder); int setup_order(THD *thd, Item **ref_pointer_array, TABLE_LIST *tables, - List<Item> &fields, List <Item> &all_fields, ORDER *order); + List<Item> &fields, List <Item> &all_fields, ORDER *order); int setup_group(THD *thd, Item **ref_pointer_array, TABLE_LIST *tables, List<Item> &fields, List<Item> &all_fields, ORDER *order, bool *hidden_group_fields); |