1 files changed, 2 insertions, 12 deletions
diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h
index 465300e721e..4832ddbd1b1 100644
--- a/sql/item_strfunc.h
+++ b/sql/item_strfunc.h
@@ -619,16 +619,6 @@ public:
   void print(String *str) { print_op(str); }
 };
 
-class Item_func_conv_charset3 :public Item_str_func
-{
-public:
-  Item_func_conv_charset3(Item *arg1,Item *arg2,Item *arg3)
-    :Item_str_func(arg1,arg2,arg3) {}
-  String *val_str(String *);
-  void fix_length_and_dec();
-  const char *func_name() const { return "convert"; }
-};
-
 class Item_func_charset :public Item_str_func
 {
 public:
@@ -637,8 +627,8 @@ public:
   const char *func_name() const { return "charset"; }
   void fix_length_and_dec() 
   {
-     max_length=40; // should be enough
      collation.set(system_charset_info);
+     max_length= 64 * collation.collation->mbmaxlen; // should be enough
   };
 };
 
@@ -650,8 +640,8 @@ public:
   const char *func_name() const { return "collation"; }
   void fix_length_and_dec()
   {
-     max_length=40; // should be enough
      collation.set(system_charset_info);
+     max_length= 64 * collation.collation->mbmaxlen; // should be enough
   };
 };