diff options
author | Sergei Golubchik <serg@mariadb.org> | 2017-09-23 20:22:30 +0200 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2017-09-23 20:22:30 +0200 |
commit | 1320ad5b9253256afe98e948d25ed0a423a1e6da (patch) | |
tree | 97369f9aa107f08568e1647c3c6cbfeaabf3feea /sql/item_timefunc.h | |
parent | 88adfd0cea34b93b50d6cc1128df45bae2124bc2 (diff) | |
parent | ca3c8d9b58fdc267b7c4df1ce3afde5ec6599344 (diff) | |
download | mariadb-git-1320ad5b9253256afe98e948d25ed0a423a1e6da.tar.gz |
Merge branch '10.2' into bb-10.2-ext
Diffstat (limited to 'sql/item_timefunc.h')
-rw-r--r-- | sql/item_timefunc.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/item_timefunc.h b/sql/item_timefunc.h index a752c160557..7d2fe46b644 100644 --- a/sql/item_timefunc.h +++ b/sql/item_timefunc.h @@ -729,6 +729,7 @@ class Item_func_now_local :public Item_func_now public: Item_func_now_local(THD *thd, uint dec): Item_func_now(thd, dec) {} const char *func_name() const { return "current_timestamp"; } + int save_in_field(Field *field, bool no_conversions); virtual void store_now_in_TIME(THD *thd, MYSQL_TIME *now_time); virtual enum Functype functype() const { return NOW_FUNC; } Item *get_copy(THD *thd, MEM_ROOT *mem_root) |