summaryrefslogtreecommitdiff
path: root/sql/sql_lex.h
diff options
context:
space:
mode:
authorVicențiu Ciorbaru <vicentiu@mariadb.org>2017-05-17 15:42:36 +0300
committerVicențiu Ciorbaru <vicentiu@mariadb.org>2017-05-17 15:42:36 +0300
commit339a290d220551255f9995372f632d6d65a05e06 (patch)
tree4e5e8e53a6417c094058ad3f0ab1951aae28af04 /sql/sql_lex.h
parentb87873b221fffccae622d4d52d9d1219e306a98f (diff)
parent934b8312817d4e8e0387fae0bd9cca3ffafbc7de (diff)
downloadmariadb-git-339a290d220551255f9995372f632d6d65a05e06.tar.gz
Merge remote-tracking branch 'origin/5.5' into 10.0
Diffstat (limited to 'sql/sql_lex.h')
-rw-r--r--sql/sql_lex.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h
index c4fd109009f..d28546edf10 100644
--- a/sql/sql_lex.h
+++ b/sql/sql_lex.h
@@ -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 */