diff options
| author | unknown <serg@serg.mylan> | 2004-06-10 21:18:57 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-06-10 21:18:57 +0200 |
| commit | b670b0b72a2f3f549985798a21f2fe8840bdcff0 (patch) | |
| tree | 3cc0388adca3b345d5907760ca63b1bb0e6f6bfc /strings/ctype-uca.c | |
| parent | 68a132fe730d7ebcca35f9ef8cfd501a80fa93d7 (diff) | |
| download | mariadb-git-b670b0b72a2f3f549985798a21f2fe8840bdcff0.tar.gz | |
bug#3964 and related issues: FTB problems with charsets where one byte can match many
correct prefix compare with my_strnncoll
include/m_ctype.h:
6th argument to my_strncoll to handle prefix comparison
myisam/ft_boolean_search.c:
bug#3964 and related issues: problems with charsets where one byte can match many
*correct* prefix compare with my_strnncoll
*correct* backup of info->lastkey
mysql-test/r/fulltext.result:
6th argument to my_strncoll to handle prefix comparison
mysql-test/t/fulltext.test:
6th argument to my_strncoll to handle prefix comparison
mysys/my_handler.c:
6th argument to my_strncoll to handle prefix comparison
sql/sql_parse.cc:
cleanup
strings/ctype-big5.c:
6th argument to my_strncoll to handle prefix comparison
strings/ctype-bin.c:
6th argument to my_strncoll to handle prefix comparison
strings/ctype-czech.c:
6th argument to my_strncoll to handle prefix comparison
strings/ctype-gbk.c:
6th argument to my_strncoll to handle prefix comparison
strings/ctype-latin1.c:
6th argument to my_strncoll to handle prefix comparison
strings/ctype-mb.c:
6th argument to my_strncoll to handle prefix comparison
strings/ctype-simple.c:
6th argument to my_strncoll to handle prefix comparison
strings/ctype-sjis.c:
6th argument to my_strncoll to handle prefix comparison
strings/ctype-tis620.c:
6th argument to my_strncoll to handle prefix comparison
strings/ctype-uca.c:
6th argument to my_strncoll to handle prefix comparison
strings/ctype-ucs2.c:
6th argument to my_strncoll to handle prefix comparison
strings/ctype-utf8.c:
6th argument to my_strncoll to handle prefix comparison
strings/ctype-win1250ch.c:
6th argument to my_strncoll to handle prefix comparison
Diffstat (limited to 'strings/ctype-uca.c')
| -rw-r--r-- | strings/ctype-uca.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/strings/ctype-uca.c b/strings/ctype-uca.c index 81073d47554..ba7d308ec5c 100644 --- a/strings/ctype-uca.c +++ b/strings/ctype-uca.c @@ -6704,7 +6704,8 @@ implicit: static int my_strnncoll_uca(CHARSET_INFO *cs, const uchar *s, uint slen, - const uchar *t, uint tlen) + const uchar *t, uint tlen, + my_bool t_is_prefix) { my_uca_scanner sscanner; my_uca_scanner tscanner; @@ -6720,7 +6721,7 @@ static int my_strnncoll_uca(CHARSET_INFO *cs, t_res= my_uca_scanner_next(&tscanner); } while ( s_res == t_res && s_res >0); - return ( s_res - t_res ); + return (t_is_prefix && t_res < 0) ? 0 : (s_res - t_res); } |