diff options
| author | unknown <serg@serg.mylan> | 2004-02-13 15:30:00 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-02-13 15:30:00 +0100 |
| commit | 4c6344ed6632f6f46f679b7194f2358452d5e04b (patch) | |
| tree | b18d35bd6d44eca9b87d18a27bf8c62a767396fa /sql/sql_string.cc | |
| parent | 9a3a0d7d4062982d0977b9268fd599d7b0745c2d (diff) | |
| parent | e05c2a90da83787ed5f3e26fdada9040ec00ab27 (diff) | |
| download | mariadb-git-4c6344ed6632f6f46f679b7194f2358452d5e04b.tar.gz | |
Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
configure.in:
Auto merged
sql/item.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_sum.h:
Auto merged
sql/sql_string.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
strings/ctype-simple.c:
Auto merged
strings/ctype-ucs2.c:
Auto merged
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)) |