diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-10-09 10:30:11 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-10-09 10:30:11 +0200 |
| commit | 1b75bed00fa4ea3925f513f4825deb00cb158d5b (patch) | |
| tree | 0822ed2a2ca42ba1acb82a6737336bbfe219bebe /strings/ctype-mb.c | |
| parent | 689ffe3559a4b7bacd13503ba93659b2f4560bbb (diff) | |
| parent | b2d71434ed24d0901155fe68b0b7ee4fdad0e2d4 (diff) | |
| download | mariadb-git-1b75bed00fa4ea3925f513f4825deb00cb158d5b.tar.gz | |
5.5.40+ merge
Diffstat (limited to 'strings/ctype-mb.c')
| -rw-r--r-- | strings/ctype-mb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/strings/ctype-mb.c b/strings/ctype-mb.c index 1ef772e1d5e..b0413099ca8 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 @@ -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; |