diff options
| author | unknown <serg@serg.mylan> | 2004-06-11 20:55:08 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-06-11 20:55:08 +0200 |
| commit | fae2a87f5c07881d3752e79b9a50102bb66560c1 (patch) | |
| tree | a0c5ea824118f68eea18cf241187a6ebd8d91648 /strings/ctype-sjis.c | |
| parent | 3023bc9941917da78c56f837548728b064e5143d (diff) | |
| parent | f12eb2ea5b4d1b2f031a49201dd392cc84c50dd4 (diff) | |
| download | mariadb-git-fae2a87f5c07881d3752e79b9a50102bb66560c1.tar.gz | |
merged
acinclude.m4:
Auto merged
include/m_ctype.h:
Auto merged
sql/sql_parse.cc:
Auto merged
strings/ctype-big5.c:
Auto merged
strings/ctype-czech.c:
Auto merged
strings/ctype-gbk.c:
Auto merged
strings/ctype-latin1.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-utf8.c:
Auto merged
strings/ctype-win1250ch.c:
Auto merged
Diffstat (limited to 'strings/ctype-sjis.c')
| -rw-r--r-- | strings/ctype-sjis.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/strings/ctype-sjis.c b/strings/ctype-sjis.c index 656c903c7a1..54a0df26f09 100644 --- a/strings/ctype-sjis.c +++ b/strings/ctype-sjis.c @@ -232,9 +232,12 @@ static int my_strnncoll_sjis_internal(CHARSET_INFO *cs, static int my_strnncoll_sjis(CHARSET_INFO *cs __attribute__((unused)), const uchar *a, uint a_length, - const uchar *b, uint b_length) + const uchar *b, uint b_length, + my_bool b_is_prefix) { int res= my_strnncoll_sjis_internal(cs, &a, a_length, &b, b_length); + if (b_is_prefix && a_length > b_length) + a_length= b_length; return res ? res : (int) (a_length - b_length); } |