diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-01-24 14:16:20 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-01-24 14:16:20 +0100 |
| commit | ceda5f724fd1ca1bcb6fb113af55179849c057d0 (patch) | |
| tree | b6d8305dd4fbfae5d8e05b2e6c67cfd65214dd7b /sql/item_timefunc.h | |
| parent | ade89fc8980a0b2763734815df7634a129c6d5dc (diff) | |
| parent | f2ccfcaca191513d12f50672ae4545f9738670f0 (diff) | |
| download | mariadb-git-ceda5f724fd1ca1bcb6fb113af55179849c057d0.tar.gz | |
Merge branch '10.2' into 10.3
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 6ab644c579b..8b39092e09a 100644 --- a/sql/item_timefunc.h +++ b/sql/item_timefunc.h @@ -901,6 +901,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(MYSQL_TIME *res, ulonglong fuzzy_date); + 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); } }; |