diff options
| author | serg@serg.mylan <> | 2004-02-13 15:30:00 +0100 |
|---|---|---|
| committer | serg@serg.mylan <> | 2004-02-13 15:30:00 +0100 |
| commit | 01c2ca5b8adbb6ad86defe286c294ff43ba864cb (patch) | |
| tree | b18d35bd6d44eca9b87d18a27bf8c62a767396fa /sql/sql_string.cc | |
| parent | d0b456fead3ea73a9b60d2dbc2fd903e8e62508b (diff) | |
| parent | 26c7003e377609dd0aec79690793f6e390c8f8d5 (diff) | |
| download | mariadb-git-01c2ca5b8adbb6ad86defe286c294ff43ba864cb.tar.gz | |
Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
Diffstat (limited to 'sql/sql_string.cc')
| -rw-r--r-- | sql/sql_string.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_string.cc b/sql/sql_string.cc index 093b85b46b7..e76c7902210 100644 --- a/sql/sql_string.cc +++ b/sql/sql_string.cc @@ -453,7 +453,7 @@ bool String::append(const char *s,uint32 arg_length, CHARSET_INFO *cs) if (!arg_length) // Default argument if (!(arg_length= (uint32) strlen(s))) return FALSE; - if (str_charset->mbmaxlen > 1) + if (cs != str_charset && str_charset->mbmaxlen > 1) { uint32 add_length=arg_length * str_charset->mbmaxlen; if (realloc(str_length+ add_length)) |