diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-06-13 15:11:43 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-06-13 15:11:43 +0300 |
commit | d83a4432503d199f6aed8e378563b08471d090dc (patch) | |
tree | 4982259fb773f1d1e627e010fba0f58a10e82a13 /sql/item.h | |
parent | 6c30bc2181328ea619d1ab61a464feb0514bf12a (diff) | |
parent | b68f1d847f1fc00eed795e20162effc8fbc4119b (diff) | |
download | mariadb-git-d83a4432503d199f6aed8e378563b08471d090dc.tar.gz |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/item.h')
-rw-r--r-- | sql/item.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sql/item.h b/sql/item.h index 769e6b80ca9..5810f244d97 100644 --- a/sql/item.h +++ b/sql/item.h @@ -6313,6 +6313,13 @@ public: bool cache_value(); bool get_date(MYSQL_TIME *ltime, ulonglong fuzzydate); int save_in_field(Field *field, bool no_conversions); + bool setup(THD *thd, Item *item) + { + if (Item_cache_int::setup(thd, item)) + return true; + set_if_smaller(decimals, TIME_SECOND_PART_DIGITS); + return false; + } void store_packed(longlong val_arg, Item *example); /* Having a clone_item method tells optimizer that this object |