diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2017-03-10 19:06:33 +0000 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2017-03-10 19:07:07 +0000 |
| commit | f2fe5cb2825144dcd8d2383bd38bc83fa4eafdf1 (patch) | |
| tree | 531533b08d1e6a9d70ee7bbb835fce837c8de8bb /strings | |
| parent | 7c512138a19abd4d8e8761b1f0eb2bd8c9809a28 (diff) | |
| download | mariadb-git-f2fe5cb2825144dcd8d2383bd38bc83fa4eafdf1.tar.gz | |
Fix several compile warnings on Windows
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/ctype-uca.c | 2 | ||||
| -rw-r--r-- | strings/ctype-utf8.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/strings/ctype-uca.c b/strings/ctype-uca.c index 79ad8ca7302..e3ed531df93 100644 --- a/strings/ctype-uca.c +++ b/strings/ctype-uca.c @@ -31610,7 +31610,7 @@ my_uca_implicit_weight_put(uint16 *to, my_wc_t code, uint level) break; } /* Primary level */ - to[0]= (code >> 15) + my_uca_implicit_weight_base(code); + to[0]= (uint16)(code >> 15) + my_uca_implicit_weight_base(code); to[1]= (code & 0x7FFF) | 0x8000; to[2]= 0; } diff --git a/strings/ctype-utf8.c b/strings/ctype-utf8.c index 6ab07d99e23..683c80f643d 100644 --- a/strings/ctype-utf8.c +++ b/strings/ctype-utf8.c @@ -4831,7 +4831,6 @@ my_strnxfrm_unicode_full_bin(CHARSET_INFO *cs, uchar *dst, size_t dstlen, uint nweights, const uchar *src, size_t srclen, uint flags) { - my_wc_t UNINIT_VAR(wc); uchar *dst0= dst; uchar *de= dst + dstlen; @@ -4877,7 +4876,6 @@ my_strnxfrm_unicode_full_nopad_bin(CHARSET_INFO *cs, uchar *dst, size_t dstlen, uint nweights, const uchar *src, size_t srclen, uint flags) { - my_wc_t UNINIT_VAR(wc); uchar *dst0= dst; uchar *de= dst + dstlen; |