diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-20 17:47:49 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-20 17:47:49 +0300 |
| commit | fc3b1a7d2fcc45c05aa19ea35e1d7978b4f90670 (patch) | |
| tree | d3f4f28b6bb2ffa6e6c4b19e6c03f2e209590171 /sql/item_timefunc.h | |
| parent | 4cfef2a5a4157269244923637032c21ff67b0161 (diff) | |
| parent | 96f06f952d087bd47225cc2784edbb0510fad818 (diff) | |
| download | mariadb-git-fc3b1a7d2fcc45c05aa19ea35e1d7978b4f90670.tar.gz | |
Merge 10.2 into bb-10.2-ext
Diffstat (limited to 'sql/item_timefunc.h')
| -rw-r--r-- | sql/item_timefunc.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/item_timefunc.h b/sql/item_timefunc.h index 4cdf7b63158..a752c160557 100644 --- a/sql/item_timefunc.h +++ b/sql/item_timefunc.h @@ -188,7 +188,6 @@ public: } bool check_vcol_func_processor(void *arg) { - return mark_unsupported_function(func_name(), "()", arg, VCOL_SESSION_FUNC); } Item *get_copy(THD *thd, MEM_ROOT *mem_root) @@ -673,8 +672,7 @@ public: virtual void store_now_in_TIME(THD *thd, MYSQL_TIME *now_time)=0; bool check_vcol_func_processor(void *arg) { - return mark_unsupported_function(func_name(), "()", arg, - VCOL_TIME_FUNC); + return mark_unsupported_function(func_name(), "()", arg, VCOL_TIME_FUNC); } }; @@ -813,6 +811,8 @@ public: bool eq(const Item *item, bool binary_cmp) const; bool check_vcol_func_processor(void *arg) { + if (is_time_format) + return false; return mark_unsupported_function(func_name(), "()", arg, VCOL_SESSION_FUNC); } Item *get_copy(THD *thd, MEM_ROOT *mem_root) |