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/field.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/item_timefunc.h:
  Auto merged
mysql-test/r/type_date.result:
  manual merge
mysql-test/t/type_date.test:
  manual merge
sql/field.cc:
  manual merge

2 files changed, 8 insertions, 0 deletions

diff --git a/sql/field.cc b/sql/field.cc
index 36ba6e6f12c..0ba1e77a4af 100644
--- a/sql/field.cc
+++ b/sql/field.cc
@@ -5524,6 +5524,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;
diff --git a/sql/field.h b/sql/field.h
index f4314720e86..2a381065f63 100644
--- a/sql/field.h
+++ b/sql/field.h
@@ -1057,6 +1057,7 @@ public:
   double val_real(void);
   longlong val_int(void);
   String *val_str(String*,String *);
+  bool get_time(MYSQL_TIME *ltime);
   bool send_binary(Protocol *protocol);
   int cmp(const uchar *,const uchar *);
   void sort_string(uchar *buff,uint length);