summaryrefslogtreecommitdiff
path: root/mysys/my_handler.c
diff options
context:
space:
mode:
authormonty@mysql.com <>2005-06-06 20:42:55 +0300
committermonty@mysql.com <>2005-06-06 20:42:55 +0300
commit8c94b5fba7f6e5518616615da63c8029c5790aea (patch)
tree02c1da62d84f37612414d36c25c3793f87c69b6c /mysys/my_handler.c
parentdec2607e1d746af5905cd22031b38fc42067a8ef (diff)
parentd83c495b9e960e20e0a3f9febc3365352bf331f5 (diff)
downloadmariadb-git-8c94b5fba7f6e5518616615da63c8029c5790aea.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
Diffstat (limited to 'mysys/my_handler.c')
-rw-r--r--mysys/my_handler.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/my_handler.c b/mysys/my_handler.c
index 87e526d0ea3..e14bd7529f9 100644
--- a/mysys/my_handler.c
+++ b/mysys/my_handler.c
@@ -23,7 +23,7 @@ int mi_compare_text(CHARSET_INFO *charset_info, uchar *a, uint a_length,
{
if (!part_key)
return charset_info->coll->strnncollsp(charset_info, a, a_length,
- b, b_length, !skip_end_space);
+ b, b_length, (my_bool)!skip_end_space);
return charset_info->coll->strnncoll(charset_info, a, a_length,
b, b_length, part_key);
}