diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-13 18:48:41 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-13 18:48:41 +0300 |
| commit | 2f7b37b02154748b223e385a7d7787900ab37b5e (patch) | |
| tree | 49a5ab1928bd840c129bd14ce72c5cf2c0190e20 /strings | |
| parent | 7f03b1d78f2aab738e38a1e33ac887757604585a (diff) | |
| parent | b811c6ecc74cc1421eedc92573447768d1eb7980 (diff) | |
| download | mariadb-git-2f7b37b02154748b223e385a7d7787900ab37b5e.tar.gz | |
Merge 10.3 into 10.4, except MDEV-22543
Also, fix GCC -Og -Wmaybe-uninitialized in run_backup_stage()
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 71530b0a7c1..586289c51fd 100644 --- a/strings/ctype-ucs2.c +++ b/strings/ctype-ucs2.c @@ -829,7 +829,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; |