summaryrefslogtreecommitdiff
path: root/mysys/my_handler.c
diff options
context:
space:
mode:
authorserg@serg.mylan <>2004-06-10 21:18:57 +0200
committerserg@serg.mylan <>2004-06-10 21:18:57 +0200
commit78fa465b924836a402e58eebb3e2b7936d712a2d (patch)
tree3cc0388adca3b345d5907760ca63b1bb0e6f6bfc /mysys/my_handler.c
parenta0464b8563761f0dda668ca8a7926ba63a9d59f4 (diff)
downloadmariadb-git-78fa465b924836a402e58eebb3e2b7936d712a2d.tar.gz
bug#3964 and related issues: FTB problems with charsets where one byte can match many
correct prefix compare with my_strnncoll
Diffstat (limited to 'mysys/my_handler.c')
-rw-r--r--mysys/my_handler.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/mysys/my_handler.c b/mysys/my_handler.c
index de0fba56d21..6003808df25 100644
--- a/mysys/my_handler.c
+++ b/mysys/my_handler.c
@@ -21,13 +21,11 @@ int mi_compare_text(CHARSET_INFO *charset_info, uchar *a, uint a_length,
uchar *b, uint b_length, my_bool part_key,
my_bool skip_end_space)
{
- if (part_key && b_length < a_length)
- a_length=b_length;
if (skip_end_space)
return charset_info->coll->strnncollsp(charset_info, a, a_length,
b, b_length);
return charset_info->coll->strnncoll(charset_info, a, a_length,
- b, b_length);
+ b, b_length, part_key);
}