diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-04-15 15:51:57 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-04-15 15:51:57 +0400 |
| commit | f2ccc595b6bf18bcc685041cd03bd8cefca944d7 (patch) | |
| tree | c46fc2343f4fb762c2dc999882621586be56199c /sql/item_timefunc.h | |
| parent | 64e63131f83ee70b2d0176323ad320ee76edff78 (diff) | |
| download | mariadb-git-f2ccc595b6bf18bcc685041cd03bd8cefca944d7.tar.gz | |
Derive Item_func_makedate from Item_datefunc rather than Item_temporal_func
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 6ee565236c3..f66c57e2fb5 100644 --- a/sql/item_timefunc.h +++ b/sql/item_timefunc.h @@ -597,6 +597,7 @@ class Item_datefunc :public Item_temporal_func public: Item_datefunc(THD *thd): Item_temporal_func(thd) { } Item_datefunc(THD *thd, Item *a): Item_temporal_func(thd, a) { } + Item_datefunc(THD *thd, Item *a, Item *b): Item_temporal_func(thd, a, b) { } enum_field_types field_type() const { return MYSQL_TYPE_DATE; } }; @@ -1126,13 +1127,12 @@ public: }; -class Item_func_makedate :public Item_temporal_func +class Item_func_makedate :public Item_datefunc { public: Item_func_makedate(THD *thd, Item *a, Item *b): - Item_temporal_func(thd, a, b) {} + Item_datefunc(thd, a, b) {} const char *func_name() const { return "makedate"; } - enum_field_types field_type() const { return MYSQL_TYPE_DATE; } bool get_date(MYSQL_TIME *ltime, ulonglong fuzzy_date); Item *get_copy(THD *thd, MEM_ROOT *mem_root) { return get_item_copy<Item_func_makedate>(thd, mem_root, this); } |