summaryrefslogtreecommitdiff
path: root/strings
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.org>2015-12-15 11:04:51 +0400
committerAlexander Barkov <bar@mariadb.org>2015-12-15 11:04:51 +0400
commit82bec8bfdf87b75e0a055a4739a69f5090ed699d (patch)
tree32cce7d04224b82529ff340cd15f104492618d89 /strings
parent16f0d996c338f2b999b745d3b070393643f267cd (diff)
downloadmariadb-git-82bec8bfdf87b75e0a055a4739a69f5090ed699d.tar.gz
MDEV-9265 SuSE patches: Suspicious implicit sign extension
Diffstat (limited to 'strings')
-rw-r--r--strings/ctype-ucs2.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/strings/ctype-ucs2.c b/strings/ctype-ucs2.c
index 5780fff003a..cae85f38c12 100644
--- a/strings/ctype-ucs2.c
+++ b/strings/ctype-ucs2.c
@@ -1911,7 +1911,8 @@ struct charset_info_st my_charset_utf16le_bin=
#define IS_MB4_CHAR(b0,b1,b2,b3) (IS_UTF32_MBHEAD4(b0,b1))
-#define MY_UTF32_WC4(b0,b1,b2,b3) ((b0 << 24) + (b1 << 16) + (b2 << 8) + (b3))
+#define MY_UTF32_WC4(b0,b1,b2,b3) ((((my_wc_t)b0) << 24) + (b1 << 16) + \
+ (b2 << 8) + (b3))
static inline int my_weight_utf32_general_ci(uchar b0, uchar b1,
uchar b2, uchar b3)