diff options
| author | Igor Babaev <igor@askmonty.org> | 2010-05-25 23:14:18 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2010-05-25 23:14:18 -0700 |
| commit | d120c5b562629dda782e3c9a66cfeaa48cbb01d1 (patch) | |
| tree | 6da6a69adc00f657dc62d863a334d57f7a0f1907 /sql/mysql_priv.h | |
| parent | d6c97c913e4e0084f01b7551c5c2f06e10c2fdc7 (diff) | |
| download | mariadb-git-d120c5b562629dda782e3c9a66cfeaa48cbb01d1.tar.gz | |
Changed the fixes for the following bugs:
Bug #39022: completed
Bug #39653: reverted as invalid
Bug #45640: ameliorated, simplified, optimized
Bug #48483: completed
Bug #49324: improved
Bug #51242/52336: reverted, applied a real fix.
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 5ceaf00d1f2..6629374187a 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -640,7 +640,8 @@ enum enum_parsing_place IN_HAVING, SELECT_LIST, IN_WHERE, - IN_ON + IN_ON, + IN_GROUP_BY }; struct st_table; @@ -1196,7 +1197,7 @@ 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); bool fix_inner_refs(THD *thd, List<Item> &all_fields, SELECT_LEX *select, - Item **ref_pointer_array, ORDER *group_list= NULL); + Item **ref_pointer_array); bool handle_select(THD *thd, LEX *lex, select_result *result, ulong setup_tables_done_option); |