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 | 1e24da548bee6359ef93423afd412287a0a7da4f (patch) | |
| tree | 3cc0388adca3b345d5907760ca63b1bb0e6f6bfc /strings/ctype-latin1.c | |
| parent | 2e8fc0cae2af64fb6f9c840b97ef6bf1ca6914cf (diff) | |
| download | mariadb-git-1e24da548bee6359ef93423afd412287a0a7da4f.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-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 0b439964c7c..257d8e37eee 100644 --- a/strings/ctype-latin1.c +++ b/strings/ctype-latin1.c @@ -525,7 +525,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; @@ -558,7 +559,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); } |