revision-id: 66fabd3e88d794477a43ffdb75faeac282daa3ed (mariadb-10.10.1-2-g66fabd3) parent(s): 63e3fc0bb76ce8b4b018d1ca1e4be6b7cd55fad1 author: Igor Babaev committer: Igor Babaev timestamp: 2022-08-15 15:58:20 -0700 message: Fixed some compiler issues appeared after d7ffb7c3dd95c4c5e36f75b09662faafa0fb1ecd --- strings/ctype-uca.c | 2 +- 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 5b3f76f..028d2cc 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 3c94cb8..989fe98 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) {