diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-08-29 14:30:29 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-08-29 14:30:29 +0300 |
| commit | 62b418bd2897b35fdaecd1aa41cc88023e3dd114 (patch) | |
| tree | 86cb43c9227e16422c67af958272958214607b62 /strings | |
| parent | 80fbd0ee94a507009cc679ba3534d9d10313678c (diff) | |
| parent | 259050f864f5417fd047d16a793933e34941f1b4 (diff) | |
| download | mariadb-git-62b418bd2897b35fdaecd1aa41cc88023e3dd114.tar.gz | |
Merge 10.10 to 10.11
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/ctype-uca.c | 2 | ||||
| -rw-r--r-- | strings/uca-dump.c | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/strings/ctype-uca.c b/strings/ctype-uca.c index 5b3f76f1be4..028d2cccd78 100644 --- a/strings/ctype-uca.c +++ b/strings/ctype-uca.c @@ -31309,7 +31309,7 @@ my_uca1400_collation_definitions[MY_UCA1400_COLLATION_DEFINITION_COUNT]= static MY_UCA_INFO my_uca1400_info_tailored[MY_CS_ENCODING_LAST+1] - [MY_UCA1400_COLLATION_DEFINITION_COUNT]= {0}; + [MY_UCA1400_COLLATION_DEFINITION_COUNT]; /* diff --git a/strings/uca-dump.c b/strings/uca-dump.c index 3c94cb8814c..989fe98f48a 100644 --- a/strings/uca-dump.c +++ b/strings/uca-dump.c @@ -762,7 +762,7 @@ int main(int ac, char **av) { char *comment; char *weight; - MY_DUCET_CHARS chr = {0}; + MY_DUCET_CHARS chr = {{0,0,0,0,0,0}, 0}; if (str[0] == '#') continue; @@ -803,7 +803,9 @@ int main(int ac, char **av) } else { - MY_DUCET_WEIGHT weights= {0}; + MY_DUCET_WEIGHT weights= {{{0,0,0,0,0,0,0,0,0}, {0,0,0,0,0,0,0,0,0}, + {0,0,0,0,0,0,0,0,0}, {0,0,0,0,0,0,0,0,0}}, + 0}; my_bool dummy; if (chr.length >= MY_UCA_MAX_CONTRACTION) { |