diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-24 10:07:56 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-24 10:07:56 +0300 |
| commit | 1333da90b5628c3f7ba98015475367837d8b0174 (patch) | |
| tree | e295081b3d6414c6b07a170559ebdd2bb0d424ec /sql/item_timefunc.h | |
| parent | 8887effe13ad87ba0460d4d3068fb5696f089bb0 (diff) | |
| parent | e3da362c037af95a85d3054243a4c9a039ceb4b4 (diff) | |
| download | mariadb-git-1333da90b5628c3f7ba98015475367837d8b0174.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/item_timefunc.h')
| -rw-r--r-- | sql/item_timefunc.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/item_timefunc.h b/sql/item_timefunc.h index 9896499e172..f994d463158 100644 --- a/sql/item_timefunc.h +++ b/sql/item_timefunc.h @@ -1170,6 +1170,7 @@ public: return args[0]->type_handler()-> Item_time_typecast_fix_length_and_dec(this); } + Sql_mode_dependency value_depends_on_sql_mode() const; Item *get_copy(THD *thd) { return get_item_copy<Item_time_typecast>(thd, this); } }; @@ -1191,6 +1192,7 @@ public: return args[0]->type_handler()-> Item_datetime_typecast_fix_length_and_dec(this); } + Sql_mode_dependency value_depends_on_sql_mode() const; Item *get_copy(THD *thd) { return get_item_copy<Item_datetime_typecast>(thd, this); } }; |