summaryrefslogtreecommitdiff
path: root/sql/item_timefunc.h
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.org>2015-12-01 13:13:23 +0400
committerAlexander Barkov <bar@mariadb.org>2015-12-01 13:13:23 +0400
commit607ef786fc50b44b8e0cb4af8fdb3c79e4a327bb (patch)
tree72c8d7e9bc632b593e485f853a211cc839446ea7 /sql/item_timefunc.h
parente3fed3b9b4f488e9ad1afa57333ae80249e6cb17 (diff)
downloadmariadb-git-607ef786fc50b44b8e0cb4af8fdb3c79e4a327bb.tar.gz
MDEV-9215 Detect cmp_type() and result_type() from field_type()
(A dependency task for MDEV-4912 Add a plugin to field types)
Diffstat (limited to 'sql/item_timefunc.h')
-rw-r--r--sql/item_timefunc.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/item_timefunc.h b/sql/item_timefunc.h
index bb840987089..32ba8f221de 100644
--- a/sql/item_timefunc.h
+++ b/sql/item_timefunc.h
@@ -165,6 +165,7 @@ public:
}
const char *func_name() const { return "month"; }
enum Item_result result_type () const { return INT_RESULT; }
+ enum_field_types field_type() const { return MYSQL_TYPE_LONGLONG; }
void fix_length_and_dec()
{
decimals= 0;
@@ -379,6 +380,7 @@ public:
return (odbc_type ? "dayofweek" : "weekday");
}
enum Item_result result_type () const { return INT_RESULT; }
+ enum_field_types field_type() const { return MYSQL_TYPE_LONGLONG; }
void fix_length_and_dec()
{
decimals= 0;
@@ -401,6 +403,7 @@ class Item_func_dayname :public Item_func_weekday
const char *func_name() const { return "dayname"; }
String *val_str(String *str);
enum Item_result result_type () const { return STRING_RESULT; }
+ enum_field_types field_type() const { return MYSQL_TYPE_VARCHAR; }
void fix_length_and_dec();
bool check_partition_func_processor(uchar *int_arg) {return TRUE;}
bool check_vcol_func_processor(uchar *int_arg) { return FALSE;}