Merge with dynamic column code

1 files changed, 7 insertions, 0 deletions

diff --git a/sql/item_timefunc.h b/sql/item_timefunc.h
index 2d499f6ef0e..27c3401a6a9 100644
--- a/sql/item_timefunc.h
+++ b/sql/item_timefunc.h
@@ -941,6 +941,7 @@ class Item_time_typecast :public Item_typecast_maybe_null
 public:
   Item_time_typecast(Item *a) :Item_typecast_maybe_null(a) {}
   const char *func_name() const { return "cast_as_time"; }
+  bool get_date(MYSQL_TIME *ltime, uint fuzzy_date);
   String *val_str(String *str);
   bool get_time(MYSQL_TIME *ltime);
   const char *cast_type() const { return "time"; }
@@ -949,6 +950,12 @@ public:
   {
     return tmp_table_field_from_field_type(table, 0);
   }
+  void fix_length_and_dec()
+  {
+    collation.set(&my_charset_bin);
+    max_length= 17;
+    maybe_null= 1;
+  }
   bool result_as_longlong() { return TRUE; }
   longlong val_int();
   double val_real() { return val_real_from_decimal(); }