From ddcc8d306c4bf8ba0f4008e5ee95706d230b14d3 Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Thu, 18 Jan 2018 17:11:02 +0000 Subject: [PATCH] Bug 20080: Test for utf8mb4 encoding and collation Signed-off-by: Tomas Cohen Arazi Signed-off-by: Mark Tompsett --- QohA/File/Specific/Kohastructure.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/QohA/File/Specific/Kohastructure.pm b/QohA/File/Specific/Kohastructure.pm index a679077..f5495e9 100644 --- a/QohA/File/Specific/Kohastructure.pm +++ b/QohA/File/Specific/Kohastructure.pm @@ -27,15 +27,15 @@ sub check_charset_collate { { $current_table = $2; } - next unless $line =~ m|CHARSET=utf8|; - next if $line =~ m|utf8_unicode_ci|; + next unless $line =~ m|CHARSET=utf8mb4|; + next if $line =~ m|utf8mb4_unicode_ci|; push @bad_charset_collate, $current_table; } close $fh; return 1 unless @bad_charset_collate; my @errors; push @errors, - "The table $_ does not have the current charset collate (see bug 11944)" + "The table $_ does not have the current charset collate (see bug 18336)" for @bad_charset_collate; return @errors; } -- 2.1.4