From 6cdff34fb2f71507f13a4706249529b63d0ef8b0 Mon Sep 17 00:00:00 2001 From: Mykola Malkov Date: Fri, 2 Jun 2023 11:27:14 +0300 Subject: [PATCH] MT#57461 Remove charset, collation exceptions Release trunk/mr11.4 was switched to Debian/bookworm where Mariadb 10.11 is used and json/sql files were rebuilt so remove these exceptions. Change-Id: I9a00e2394eec82a2c2b3ce518df3fa8f731c6e4f --- helper/compare_dbs.pl | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/helper/compare_dbs.pl b/helper/compare_dbs.pl index b720119..4d35f1c 100755 --- a/helper/compare_dbs.pl +++ b/helper/compare_dbs.pl @@ -21,7 +21,6 @@ use JSON::XS; # 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 @@ -36,7 +35,7 @@ my @diff_exceptions = qw( tables/accounting/cdr_group/create_options tables/accounting/cdr_period_costs/create_options tables/accounting/cdr/create_options - + .+/accounting/cdr_cash_balance_data_[0-9]{6}/.+ .+/accounting/cdr_time_balance_data_[0-9]{6}/.+ .+/accounting/cdr_relation_data_[0-9]{6}/.+ @@ -46,10 +45,6 @@ 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 - columns/.+/.+/.+/collation_name - columns/.+/.+/.+/character_set_name ); my $credentials_file = '/etc/mysql/sipwise_extra.cnf';