From 4fa867494dec481ed38ea3a8cce529c5f02783bb Mon Sep 17 00:00:00 2001
From: "bar@mysql.com" <>
Date: Tue, 14 Dec 2004 15:58:30 +0400
Subject: bug#6275 "client_test" fail in 4.1.7 make test bug#6911 resultset
 metadata always return client character set

---
 sql/item.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sql/item.h')

diff --git a/sql/item.h b/sql/item.h
index 71b92cd1efc..1024251793e 100644
--- a/sql/item.h
+++ b/sql/item.h
@@ -765,7 +765,7 @@ class Item_empty_string :public Item_string
 public:
   Item_empty_string(const char *header,uint length, CHARSET_INFO *cs= NULL) :
     Item_string("",0, cs ? cs : &my_charset_bin)
-    { name=(char*) header; max_length=length;}
+    { name=(char*) header; max_length= cs ? length * cs->mbmaxlen : length; }
   void make_field(Send_field *field);
 };
 
-- 
cgit v1.2.1