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 | e9242d685b25e0dce109719e79271edf1b1581e5 (patch) | |
| tree | a0c5ea824118f68eea18cf241187a6ebd8d91648 /mysys | |
| parent | b67706b131b94fea221e459337191b446554bd8f (diff) | |
| parent | aed108a2b7aa8eb8fdb5fe6d2a8afeed6ca63fe7 (diff) | |
| download | mariadb-git-e9242d685b25e0dce109719e79271edf1b1581e5.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 'mysys')
| -rw-r--r-- | mysys/my_handler.c | 4 |
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); } |