summaryrefslogtreecommitdiff
path: root/sql/item.h
diff options
context:
space:
mode:
authorbar@mysql.com <>2004-12-14 15:58:30 +0400
committerbar@mysql.com <>2004-12-14 15:58:30 +0400
commit4fa867494dec481ed38ea3a8cce529c5f02783bb (patch)
tree8c2a5840db77732f2a993807f7fb2844fe58fa03 /sql/item.h
parent94b3e06dd6dc258602b571c8b9803fce443c638d (diff)
downloadmariadb-git-4fa867494dec481ed38ea3a8cce529c5f02783bb.tar.gz
bug#6275 "client_test" fail in 4.1.7 make test
bug#6911 resultset metadata always return client character set
Diffstat (limited to 'sql/item.h')
-rw-r--r--sql/item.h2
1 files changed, 1 insertions, 1 deletions
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);
};