Merge with 4.0

1 files changed, 13 insertions, 0 deletions

diff --git a/sql/item_timefunc.h b/sql/item_timefunc.h
index 07cdfde115b..7765769c1d3 100644
--- a/sql/item_timefunc.h
+++ b/sql/item_timefunc.h
@@ -513,6 +513,7 @@ public:
   bool get_date(TIME *res,bool fuzzy_date);
 };
 
+
 class Item_extract :public Item_int_func
 {
   const interval_type int_type;
@@ -526,10 +527,12 @@ class Item_extract :public Item_int_func
   void fix_length_and_dec();
 };
 
+
 class Item_typecast :public Item_str_func
 {
 public:
   Item_typecast(Item *a) :Item_str_func(a) {}
+  const char *func_name() const { return "char"; }
   String *val_str(String *a)
   { a=args[0]->val_str(a); null_value=args[0]->null_value; return a; }
   void fix_length_and_dec() { max_length=args[0]->max_length; }
@@ -537,6 +540,14 @@ public:
 };
 
 
+class Item_char_typecast :public Item_typecast
+{
+public:
+  Item_char_typecast(Item *a) :Item_typecast(a) {}
+  void fix_length_and_dec() { binary=0; max_length=args[0]->max_length; }
+};
+
+
 class Item_date_typecast :public Item_typecast
 {
 public:
@@ -553,6 +564,7 @@ public:
   }  
 };
 
+
 class Item_time_typecast :public Item_typecast
 {
 public:
@@ -569,6 +581,7 @@ public:
   }
 };
 
+
 class Item_datetime_typecast :public Item_typecast
 {
 public: