diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-14 11:33:35 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-14 11:33:35 +0300 |
commit | cf87f3e08c10dd7a944447ddee93fbc3827e6570 (patch) | |
tree | 3c81320e2811d99e075f7d03d3bf0d1cdfa48c84 /strings | |
parent | 1bf77cde5c62166c0f1652c2a1764e05ce76edb5 (diff) | |
parent | 2f7b37b02154748b223e385a7d7787900ab37b5e (diff) | |
download | mariadb-git-cf87f3e08c10dd7a944447ddee93fbc3827e6570.tar.gz |
Merge 10.4 into 10.5
Diffstat (limited to 'strings')
-rw-r--r-- | strings/ctype-ucs2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/strings/ctype-ucs2.c b/strings/ctype-ucs2.c index c72fc9b6d00..9b7cea54d00 100644 --- a/strings/ctype-ucs2.c +++ b/strings/ctype-ucs2.c @@ -828,7 +828,7 @@ my_strtoll10_mb2(CHARSET_INFO *cs __attribute__((unused)), const char *nptr, char **endptr, int *error) { const uchar *s, *end, *start, *n_end, *true_end; - uchar c; + uchar UNINIT_VAR(c); unsigned long i, j, k; ulonglong li; int negative; |