diff options
| author | Chad MILLER <chad@mysql.com> | 2008-08-15 16:42:29 -0400 |
|---|---|---|
| committer | Chad MILLER <chad@mysql.com> | 2008-08-15 16:42:29 -0400 |
| commit | 86fd86ed9839204be5bbae11bc19a3e1a3728332 (patch) | |
| tree | 94de722ccdcd9bca5f90f9cc56c63b9d4079f262 /sql/item.h | |
| parent | 535a183964266db58342b90489dc12d350bb2465 (diff) | |
| parent | 21598ea0e6c9495aba817b0101488549e4e78bd3 (diff) | |
| download | mariadb-git-86fd86ed9839204be5bbae11bc19a3e1a3728332.tar.gz | |
Merge from 5.0-bugteam.
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 2c9af80195b..be343e25d3f 100644 --- a/sql/item.h +++ b/sql/item.h @@ -2046,7 +2046,7 @@ class Item_empty_string :public Item_partition_func_safe_string public: Item_empty_string(const char *header,uint length, CHARSET_INFO *cs= NULL) : Item_partition_func_safe_string("",0, cs ? cs : &my_charset_utf8_general_ci) - { name=(char*) header; max_length= cs ? length * cs->mbmaxlen : length; } + { name=(char*) header; max_length= length * collation.collation->mbmaxlen; } void make_field(Send_field *field); }; |