diff options
| author | unknown <konstantin@mysql.com> | 2005-01-13 17:31:49 +0300 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2005-01-13 17:31:49 +0300 |
| commit | 6a7956dce0e510c2cb3c127be2be2e4960fd258f (patch) | |
| tree | 589a6b326750729b4c6b6133c6f985394d9d387a /strings/ctype-big5.c | |
| parent | 0906c576bd12f5bdcf78a17a1e03d22815279204 (diff) | |
| parent | 8dea326cf9f060588cda6a824e8a90a222ac0285 (diff) | |
| download | mariadb-git-6a7956dce0e510c2cb3c127be2be2e4960fd258f.tar.gz | |
manual merge
mysql-test/r/ctype_latin1_de.result:
Auto merged
mysql-test/r/ctype_tis620.result:
Auto merged
mysql-test/r/ctype_ucs.result:
Auto merged
mysql-test/r/ctype_ujis.result:
Auto merged
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/t/ctype_ucs.test:
Auto merged
sql/field.cc:
Auto merged
sql/filesort.cc:
Auto merged
strings/ctype-big5.c:
Auto merged
strings/ctype-bin.c:
Auto merged
strings/ctype-czech.c:
Auto merged
strings/ctype-gbk.c:
Auto merged
strings/ctype-latin1.c:
Auto merged
strings/ctype-mb.c:
Auto merged
strings/ctype-simple.c:
Auto merged
strings/ctype-sjis.c:
Auto merged
strings/ctype-tis620.c:
Auto merged
strings/ctype-uca.c:
Auto merged
strings/ctype-ucs2.c:
Auto merged
strings/ctype-utf8.c:
Auto merged
strings/ctype-win1250ch.c:
Auto merged
Diffstat (limited to 'strings/ctype-big5.c')
| -rw-r--r-- | strings/ctype-big5.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/strings/ctype-big5.c b/strings/ctype-big5.c index d9532cddc4d..a2db7de244e 100644 --- a/strings/ctype-big5.c +++ b/strings/ctype-big5.c @@ -307,6 +307,7 @@ static int my_strnxfrm_big5(CHARSET_INFO *cs __attribute__((unused)), const uchar * src, uint srclen) { uint16 e; + uint dstlen= len; len = srclen; while (len--) @@ -321,7 +322,9 @@ static int my_strnxfrm_big5(CHARSET_INFO *cs __attribute__((unused)), } else *dest++ = sort_order_big5[(uchar) *src++]; } - return srclen; + if (dstlen > srclen) + bfill(dest, dstlen - srclen, ' '); + return dstlen; } #if 0 |