From f2ccc595b6bf18bcc685041cd03bd8cefca944d7 Mon Sep 17 00:00:00 2001 From: Alexander Barkov Date: Sat, 15 Apr 2017 15:51:57 +0400 Subject: [PATCH] Derive Item_func_makedate from Item_datefunc rather than Item_temporal_func --- sql/item_timefunc.h | 6 +++--- 1 file 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(thd, mem_root, this); }