mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-05 14:45:31 +02:00
Code Issues Projects Releases Packages Wiki Activity

WL#4189 mtr.pl v2

Browse source 
- Add a "skip-ssl=1" to [mysqltest] section so that 
   mysqltest will not run with ssl turned on by default 
   but stil be able to turn it on when requested
 - This avoids that check_warnings and check_testcase
   connects to the server woth SSL turned on
This commit is contained in:
Magnus Svensson 2009-01-27 14:21:18 +01:00
commit b3e1ca1f2c
2 changed files with 16 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
mysql-test/lib/My/ConfigFactory.pm
View file

@ -150,6 +150,13 @@ sub ssl_supported {
return $self->{ARGS}->{ssl};
}
sub fix_skip_ssl {
return if !ssl_supported(@_);
# Add skip-ssl if ssl is supported to avoid
# that mysqltest connects with SSL by default
return 1;
}
sub fix_ssl_ca {
return if !ssl_supported(@_);
my $std_data= fix_std_data(@_);
@ -287,6 +294,7 @@ my @mysqltest_rules=
{ 'ssl-ca' => \&fix_ssl_ca },
{ 'ssl-cert' => \&fix_ssl_client_cert },
{ 'ssl-key' => \&fix_ssl_client_key },
{ 'skip-ssl' => \&fix_skip_ssl },
);