database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge remote-tracking branch 'origin/5.5' into 10.0

Browse Source
This commit is contained in:
Vicențiu Ciorbaru
2017-05-17 15:42:36 +03:00
parent b87873b221 934b831281
commit 339a290d22
19 changed files with 452 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_lex.h
View File

@ -704,6 +704,11 @@ public:
*/
List<Item_func_match> *ftfunc_list;
List<Item_func_match> ftfunc_list_alloc;
/*
The list of items to which MIN/MAX optimizations of opt_sum_query()
have been applied. Used to rollback those optimizations if it's needed.
*/
List<Item_sum> min_max_opt_list;
JOIN *join; /* after JOIN::prepare it is pointer to corresponding JOIN */
List<TABLE_LIST> top_join_list; /* join list of the top level */
List<TABLE_LIST> *join_list; /* list for the currently parsed join */