diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-01-28 09:42:21 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-01-28 09:42:21 +0100 |
| commit | bc891054962bc7cbd249f1ff75c64adb3b5bbc59 (patch) | |
| tree | 16ef9b9a93076216904cd3234425b9dc33cae8a7 /sql/item_timefunc.h | |
| parent | 1ef8d0b45da2987c0f7fac180fb630ce75087d2e (diff) | |
| parent | ba6bfc402c352372cc1a9ec20b5dc50b2204549f (diff) | |
| download | mariadb-git-bc891054962bc7cbd249f1ff75c64adb3b5bbc59.tar.gz | |
Merge branch 'bb-10.4-release' into 10.4
Diffstat (limited to 'sql/item_timefunc.h')
| -rw-r--r-- | sql/item_timefunc.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/item_timefunc.h b/sql/item_timefunc.h index 8a69a0a3d5a..b3ecd1dfd4d 100644 --- a/sql/item_timefunc.h +++ b/sql/item_timefunc.h @@ -857,6 +857,10 @@ class Item_func_from_unixtime :public Item_datetimefunc const char *func_name() const { return "from_unixtime"; } bool fix_length_and_dec(); bool get_date(THD *thd, MYSQL_TIME *res, date_mode_t fuzzydate); + bool check_vcol_func_processor(void *arg) + { + return mark_unsupported_function(func_name(), "()", arg, VCOL_SESSION_FUNC); + } Item *get_copy(THD *thd) { return get_item_copy<Item_func_from_unixtime>(thd, this); } }; |