diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-05-23 11:09:47 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-05-23 11:09:47 +0300 |
| commit | 8f643e2063c9890a353149f39ef85b2cf3151fd0 (patch) | |
| tree | c5468b905c8858dc1cc80ccb2072a923b28c8783 /sql/sql_lex.h | |
| parent | 3aecedb2f8f99c446a5ba0b02efcf422a252c9e8 (diff) | |
| parent | b61700c22104b513caa9a85e5c6529aa5f2bf4e4 (diff) | |
| download | mariadb-git-8f643e2063c9890a353149f39ef85b2cf3151fd0.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'sql/sql_lex.h')
| -rw-r--r-- | sql/sql_lex.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h index 3b45b1ad40c..face3bcc378 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -789,6 +789,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 */ |