diff options
author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-05-17 15:42:36 +0300 |
---|---|---|
committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-05-17 15:42:36 +0300 |
commit | 339a290d220551255f9995372f632d6d65a05e06 (patch) | |
tree | 4e5e8e53a6417c094058ad3f0ab1951aae28af04 /sql/item_sum.h | |
parent | b87873b221fffccae622d4d52d9d1219e306a98f (diff) | |
parent | 934b8312817d4e8e0387fae0bd9cca3ffafbc7de (diff) | |
download | mariadb-git-339a290d220551255f9995372f632d6d65a05e06.tar.gz |
Merge remote-tracking branch 'origin/5.5' into 10.0
Diffstat (limited to 'sql/item_sum.h')
-rw-r--r-- | sql/item_sum.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/item_sum.h b/sql/item_sum.h index 09a20487226..f4be2108e1b 100644 --- a/sql/item_sum.h +++ b/sql/item_sum.h @@ -454,6 +454,7 @@ public: used_tables_cache= 0; forced_const= TRUE; } + void reset_forced_const() { forced_const= FALSE; } virtual bool const_item() const { return forced_const; } virtual bool const_during_execution() const { return false; } virtual void print(String *str, enum_query_type query_type); |