diff options
Diffstat (limited to 'strings/ctype-mb.c')
| -rw-r--r-- | strings/ctype-mb.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/strings/ctype-mb.c b/strings/ctype-mb.c index 1ef772e1d5e..02a9a91ca6a 100644 --- a/strings/ctype-mb.c +++ b/strings/ctype-mb.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. +/* Copyright (c) 2000, 2014, Oracle and/or its affiliates. Copyright (c) 2009, 2014, SkySQL Ab. This program is free software; you can redistribute it and/or modify @@ -354,7 +354,7 @@ int my_wildcmp_mb_impl(CHARSET_INFO *cs, if (tmp <= 0) return (tmp); } - } while (str != str_end && wildstr[0] != w_many); + } while (str != str_end); return(-1); } } @@ -1134,7 +1134,7 @@ static int my_wildcmp_mb_bin_impl(CHARSET_INFO *cs, } if (*wildstr == w_many) { /* Found w_many */ - uchar cmp; + int cmp; const char* mb = wildstr; int mb_len=0; @@ -1192,7 +1192,7 @@ static int my_wildcmp_mb_bin_impl(CHARSET_INFO *cs, if (tmp <= 0) return (tmp); } - } while (str != str_end && wildstr[0] != w_many); + } while (str != str_end); return(-1); } } |