summaryrefslogtreecommitdiff
path: root/sql/item_timefunc.h
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.org>2017-10-03 13:27:52 +0400
committerAlexander Barkov <bar@mariadb.org>2017-10-03 13:27:52 +0400
commit64bfad6307ba93ad1e18f283d68c1c722cb7a6da (patch)
treebdddf9b658a3dcbaeb52c6d664204449eee39f6f /sql/item_timefunc.h
parentc3a44c27017949aadbd27788562402f6cf7f0aa6 (diff)
downloadmariadb-git-64bfad6307ba93ad1e18f283d68c1c722cb7a6da.tar.gz
Fixing Item_func_hybrid_field_type::date_op(,uint) to date_op(,ulonglong)
Fixing the data type for the "fuzzydate" parameter to Item_func_hybrid_field_type::date_op() from uint to ulonglong, for consistency with Item::get_date().
Diffstat (limited to 'sql/item_timefunc.h')
-rw-r--r--sql/item_timefunc.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/item_timefunc.h b/sql/item_timefunc.h
index 65057a71c4e..94794c6789d 100644
--- a/sql/item_timefunc.h
+++ b/sql/item_timefunc.h
@@ -493,7 +493,11 @@ public:
}
double real_op() { DBUG_ASSERT(0); return 0; }
String *str_op(String *str) { DBUG_ASSERT(0); return 0; }
- bool date_op(MYSQL_TIME *ltime, uint fuzzydate) { DBUG_ASSERT(0); return true; }
+ bool date_op(MYSQL_TIME *ltime, ulonglong fuzzydate)
+ {
+ DBUG_ASSERT(0);
+ return true;
+ }
};