diff options
| author | serg@serg.mylan <> | 2004-06-11 20:55:08 +0200 |
|---|---|---|
| committer | serg@serg.mylan <> | 2004-06-11 20:55:08 +0200 |
| commit | 035e03c1f64888851887f6015a3db22b1f1cf477 (patch) | |
| tree | a0c5ea824118f68eea18cf241187a6ebd8d91648 /strings/ctype-latin1.c | |
| parent | 1bedda607257af92fa1ea1c32c97daccb855386b (diff) | |
| parent | 683a8893a8a616199e658ab400831ccfc5158422 (diff) | |
| download | mariadb-git-035e03c1f64888851887f6015a3db22b1f1cf477.tar.gz | |
merged
Diffstat (limited to 'strings/ctype-latin1.c')
| -rw-r--r-- | strings/ctype-latin1.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/strings/ctype-latin1.c b/strings/ctype-latin1.c index f5e7fd8baa4..dd9ab4399fb 100644 --- a/strings/ctype-latin1.c +++ b/strings/ctype-latin1.c @@ -528,7 +528,8 @@ uchar combo2map[]={ static int my_strnncoll_latin1_de(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) { const uchar *a_end= a + a_length; const uchar *b_end= b + b_length; @@ -561,7 +562,7 @@ static int my_strnncoll_latin1_de(CHARSET_INFO *cs __attribute__((unused)), A simple test of string lengths won't work -- we test to see which string ran out first */ - return ((a < a_end || a_extend) ? 1 : + return ((a < a_end || a_extend) ? (b_is_prefix ? 0 : 1) : (b < b_end || b_extend) ? -1 : 0); } |