1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Derive Item_func_makedate from Item_datefunc rather than Item_temporal_func

Browse Source
This commit is contained in:
Alexander Barkov 2017-04-15 15:51:57 +04:00
parent 64e63131f8
commit f2ccc595b6
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sql/item_timefunc.h
View File

@ -597,6 +597,7 @@ class Item_datefunc :public Item_temporal_func
public: public:
Item_datefunc(THD *thd): Item_temporal_func(thd) { } 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_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; } 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: public:
Item_func_makedate(THD *thd, Item *a, Item *b): 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"; } 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); bool get_date(MYSQL_TIME *ltime, ulonglong fuzzy_date);
Item *get_copy(THD *thd, MEM_ROOT *mem_root) Item *get_copy(THD *thd, MEM_ROOT *mem_root)
{ return get_item_copy<Item_func_makedate>(thd, mem_root, this); } { return get_item_copy<Item_func_makedate>(thd, mem_root, this); }