@@ -, +, @@ --------- cd ~/qa-test-tools git pull git checkout -b bug_20080 origin/master git bz apply 20080 cd ~/kohaclone git pull git checkout -b bug_20080 origin/master git bz apply 18336 changing CHARSET and COLLATE on a table to just utf8, instead of the utf8mb variation it is. git add installer/data/mysql/kohastructure.sql git commit -- doesn't matter what the commit message is. kshell qa -v 2 -c 1 -- this should fail with a collation problem. changing CHARSET and COLLATE on a table back to the utf8mb variation it was. kshell qa -v 2 -c 2 -- this should pass --- QohA/File/Specific/Kohastructure.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/QohA/File/Specific/Kohastructure.pm +++ a/QohA/File/Specific/Kohastructure.pm @@ -27,7 +27,7 @@ sub check_charset_collate { { $current_table = $2; } - next unless $line =~ m|CHARSET=utf8mb4|; + next if $line =~ m|CHARSET=utf8mb4|; next if $line =~ m|utf8mb4_unicode_ci|; push @bad_charset_collate, $current_table; } --