summaryrefslogtreecommitdiff
path: root/sql/field.cc
diff options
context:
space:
mode:
authorunknown <tnurnberg@white.intern.koehntopp.de>2007-12-20 08:32:51 +0100
committerunknown <tnurnberg@white.intern.koehntopp.de>2007-12-20 08:32:51 +0100
commit3a13408f8547b0f15952b8fd909bcc527910cc1a (patch)
treec40db0891ce6035f13157b94c5cfe88392cc8ec0 /sql/field.cc
parent82e026c1462dc2b5971bb83efffa5a82492dc1e7 (diff)
parent473d424782e46f4870605bdf482cd5f7e242e7a9 (diff)
downloadmariadb-git-3a13408f8547b0f15952b8fd909bcc527910cc1a.tar.gz
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into mysql.com:/misc/mysql/31990/51-31990 mysql-test/r/type_date.result: Auto merged mysql-test/t/cast.test: Auto merged mysql-test/t/type_date.test: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/item_timefunc.cc: Auto merged
Diffstat (limited to 'sql/field.cc')
-rw-r--r--sql/field.cc7
1 files changed, 7 insertions, 0 deletions
diff --git a/sql/field.cc b/sql/field.cc
index 93588992fed..52168e713aa 100644
--- a/sql/field.cc
+++ b/sql/field.cc
@@ -5636,6 +5636,13 @@ String *Field_date::val_str(String *val_buffer,
}
+bool Field_date::get_time(MYSQL_TIME *ltime)
+{
+ bzero((char *)ltime, sizeof(MYSQL_TIME));
+ return 0;
+}
+
+
int Field_date::cmp(const uchar *a_ptr, const uchar *b_ptr)
{
int32 a,b;