summaryrefslogtreecommitdiff
path: root/sql/item_timefunc.cc
diff options
context:
space:
mode:
authorunknown <tnurnberg@white.intern.koehntopp.de>2007-11-10 03:11:18 +0100
committerunknown <tnurnberg@white.intern.koehntopp.de>2007-11-10 03:11:18 +0100
commit3e90d4185098e077780569248a1151648bd5f188 (patch)
tree31f7387dc6e20a18054fe00a73b3bed58ad0b4bf /sql/item_timefunc.cc
parentf97b8e48b8f6ec290f7cc7ca3fe59c33f7cb0d9e (diff)
parentb1fc4b9e639ab6913df49bbd8c01103eaf14c81d (diff)
downloadmariadb-git-3e90d4185098e077780569248a1151648bd5f188.tar.gz
Merge mysql.com:/misc/mysql/31990/50-31990
into mysql.com:/misc/mysql/31990/51-31990 mysql-test/r/cast.result: Auto merged mysql-test/t/cast.test: Auto merged sql/item_timefunc.cc: Auto merged sql/item_timefunc.h: Auto merged
Diffstat (limited to 'sql/item_timefunc.cc')
-rw-r--r--sql/item_timefunc.cc7
1 files changed, 7 insertions, 0 deletions
diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc
index 8240b7178c7..e7d513e9d6a 100644
--- a/sql/item_timefunc.cc
+++ b/sql/item_timefunc.cc
@@ -2586,6 +2586,13 @@ bool Item_date_typecast::get_date(MYSQL_TIME *ltime, uint fuzzy_date)
}
+bool Item_date_typecast::get_time(MYSQL_TIME *ltime)
+{
+ bzero((char *)ltime, sizeof(MYSQL_TIME));
+ return args[0]->null_value;
+}
+
+
String *Item_date_typecast::val_str(String *str)
{
DBUG_ASSERT(fixed == 1);