diff options
| author | ram@gw.mysql.r18.ru <> | 2004-12-14 16:26:10 +0400 |
|---|---|---|
| committer | ram@gw.mysql.r18.ru <> | 2004-12-14 16:26:10 +0400 |
| commit | 7c31ea4d839cc351eea24b4ced1a44731792af29 (patch) | |
| tree | 721c4d7df145ffddd146b49599780e5b2c0b1c5b /sql/item.h | |
| parent | 5c5d51c2d6fa1643130063d530c1e7b764754aff (diff) | |
| parent | 4fa867494dec481ed38ea3a8cce529c5f02783bb (diff) | |
| download | mariadb-git-7c31ea4d839cc351eea24b4ced1a44731792af29.tar.gz | |
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1
Diffstat (limited to 'sql/item.h')
| -rw-r--r-- | sql/item.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item.h b/sql/item.h index fb649547fa2..237a8f7efac 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); }; |