WL#4189 mtr.pl v2

 - 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

2 files changed, 16 insertions, 12 deletions

diff --git a/mysql-test/lib/My/ConfigFactory.pm b/mysql-test/lib/My/ConfigFactory.pm
index 31927f5e8d5..567a05ac7a1 100644
--- a/mysql-test/lib/My/ConfigFactory.pm
+++ b/mysql-test/lib/My/ConfigFactory.pm
@@ -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 },
 );
 
 
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 4bd9f107f9d..53e87e30f29 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -130,14 +130,14 @@ our @opt_combinations;
 
 our @opt_extra_mysqld_opt;
 
-our $opt_compress;
-our $opt_ssl;
-our $opt_skip_ssl;
-our $opt_ssl_supported;
-our $opt_ps_protocol;
-our $opt_sp_protocol;
-our $opt_cursor_protocol;
-our $opt_view_protocol;
+my $opt_compress;
+my $opt_ssl;
+my $opt_skip_ssl;
+my $opt_ssl_supported;
+my $opt_ps_protocol;
+my $opt_sp_protocol;
+my $opt_cursor_protocol;
+my $opt_view_protocol;
 
 our $opt_debug;
 our @opt_cases;                  # The test cases names in argv
@@ -4454,10 +4454,6 @@ sub start_mysqltest ($) {
     # Turn on SSL for _all_ test cases if option --ssl was used
     mtr_add_arg($args, "--ssl");
   }
-  elsif ( $opt_ssl_supported )
-  {
-    mtr_add_arg($args, "--skip-ssl");
-  }
 
   if ( $opt_embedded_server )
   {