database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge 10.2 into bb-10.2-ext

Browse Source
This commit is contained in:
Marko Mäkelä
2017-06-27 08:13:59 +03:00
parent ed61fddf24 29624ea304
commit 43c77bb937
79 changed files with 2852 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_lex.h
View File

@ -1196,7 +1196,7 @@ public:
bool check_subqueries_with_recursive_references();
void collect_grouping_fields(THD *thd);
void check_cond_extraction_for_grouping_fields(Item *cond,
Item_processor processor);
TABLE_LIST *derived);
Item *build_cond_for_grouping_fields(THD *thd, Item *cond,
bool no_to_clones);