1 files changed, 9 insertions, 7 deletions
diff --git a/sql/item_timefunc.h b/sql/item_timefunc.h
index 29cfad2e095..d84267a5066 100644
--- a/sql/item_timefunc.h
+++ b/sql/item_timefunc.h
@@ -614,13 +614,15 @@ public:
 
 class Item_char_typecast :public Item_typecast
 {
-public:
-  Item_char_typecast(Item *a) :Item_typecast(a) {}
-  void fix_length_and_dec()
-  {
-    collation.set(default_charset());
-    max_length=args[0]->max_length;
-  }
+  int cast_length;
+  CHARSET_INFO *cast_cs;
+  bool charset_conversion;
+  String tmp_value;
+public:
+  Item_char_typecast(Item *a, int length_arg, CHARSET_INFO *cs_arg)
+    :Item_typecast(a), cast_length(length_arg), cast_cs(cs_arg) {}
+  String *val_str(String *a);
+  void fix_length_and_dec();
 };