Lines 27-41
sub check_charset_collate {
Link Here
|
27 |
{ |
27 |
{ |
28 |
$current_table = $2; |
28 |
$current_table = $2; |
29 |
} |
29 |
} |
30 |
next unless $line =~ m|CHARSET=utf8|; |
30 |
next unless $line =~ m|CHARSET=utf8mb4|; |
31 |
next if $line =~ m|utf8_unicode_ci|; |
31 |
next if $line =~ m|utf8mb4_unicode_ci|; |
32 |
push @bad_charset_collate, $current_table; |
32 |
push @bad_charset_collate, $current_table; |
33 |
} |
33 |
} |
34 |
close $fh; |
34 |
close $fh; |
35 |
return 1 unless @bad_charset_collate; |
35 |
return 1 unless @bad_charset_collate; |
36 |
my @errors; |
36 |
my @errors; |
37 |
push @errors, |
37 |
push @errors, |
38 |
"The table $_ does not have the current charset collate (see bug 11944)" |
38 |
"The table $_ does not have the current charset collate (see bug 18336)" |
39 |
for @bad_charset_collate; |
39 |
for @bad_charset_collate; |
40 |
return @errors; |
40 |
return @errors; |
41 |
} |
41 |
} |
42 |
- |
|
|