database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Automerge from mysql-trunk.

Browse Source
This commit is contained in:
Alexander Nozdrin
2009-10-23 00:24:24 +04:00
parent 4f12a0ba80 2fc2acd7f5
commit 2a6e8d37f1
12 changed files with 123 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mysql-test/lib/mtr_cases.pm
View File

@ -981,6 +981,17 @@ sub collect_one_test_case {
}
}
if ( $tinfo->{'need_ssl'} )
{
# This is a test that needs ssl
if ( ! $::opt_ssl_supported ) {
# SSL is not supported, skip it
$tinfo->{'skip'}= 1;
$tinfo->{'comment'}= "No SSL support";
return $tinfo;
}
}
# ----------------------------------------------------------------------
# Find config file to use if not already selected in <testname>.opt file
# ----------------------------------------------------------------------
@ -1061,6 +1072,7 @@ my @tags=
["include/ndb_master-slave.inc", "ndb_test", 1],
["federated.inc", "federated_test", 1],
["include/not_embedded.inc", "not_embedded", 1],
["include/have_ssl.inc", "need_ssl", 1],
);