From 3e66fbb1b40860186bb16883e820944bbf3bc586 Mon Sep 17 00:00:00 2001 From: Mykola Malkov Date: Fri, 19 May 2023 15:31:15 +0300 Subject: [PATCH] MT#57461 Ignore tables' table_collation In mariadb 10.6 utf8 was renamed to to utf8mb3: https://jira.mariadb.org/browse/MDEV-8334 Now json files are built on mariadb 10.5 while on bookworm mariadb 10.11 is used. So until trunk is switched to bookworm we have to skip this part. Change-Id: Ia28b9560f516af569c9e76c318d08765af42740f --- helper/compare_dbs.pl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/helper/compare_dbs.pl b/helper/compare_dbs.pl index 07eb7cb..abe8b0a 100755 --- a/helper/compare_dbs.pl +++ b/helper/compare_dbs.pl @@ -20,6 +20,8 @@ use JSON::XS; # For columns: columns//_ # columns/billing/table1_column1/is_nullable # tables/mysql/.+/create_options + +# Remove tables/.+/.+/table_collation when trunk is switched to bookworm my @diff_exceptions = qw( views/ldap/ldap_entries/view_definition tables/mysql/.+/create_options @@ -44,6 +46,8 @@ my @diff_exceptions = qw( .+/accounting/cdr_group_[0-9]{6}/.+ .+/accounting/cdr_period_costs_[0-9]{6}/.+ .+/accounting/cdr_[0-9]{6}/.+ + + tables/.+/.+/table_collation ); my $credentials_file = '/etc/mysql/sipwise_extra.cnf';