From 3acf74105175d4c909e0ea8e969f3d78bfc5f7af Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Tue, 2 Jul 2019 21:23:47 +0200 Subject: fix suite.pm to not garble $_ --- mysql-test/suite.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'mysql-test/suite.pm') diff --git a/mysql-test/suite.pm b/mysql-test/suite.pm index 7c0c1b508ea..5b3ccc711de 100644 --- a/mysql-test/suite.pm +++ b/mysql-test/suite.pm @@ -77,11 +77,11 @@ sub skip_combinations { my $openssl_cnf='/etc/ssl/openssl.cnf'; if ($openssl_ver and open my $f, '<', $openssl_cnf) { local $/; - $_=<$f>; + my $cnf=<$f>; $skip{'main/tls_version.test'} = "TLSv1.1 disabled in $openssl_cnf" - if /^\s*MinProtocol\s*=\s*TLSv1.[2-9]/m; + if $cnf =~ /^\s*MinProtocol\s*=\s*TLSv1.[2-9]/m; $skip{'main/tls_version1.test'} = "TLSv1.0 disabled in $openssl_cnf" - if /^\s*MinProtocol\s*=\s*TLSv1.[1-9]/m; + if $cnf =~ /^\s*MinProtocol\s*=\s*TLSv1.[1-9]/m; } %skip; -- cgit v1.2.1