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

mysql-test-run.pl, mysql-test-run.sh:

Browse Source 
Corrected path to SSL certificate files


mysql-test/mysql-test-run.sh:
  Corrected path to SSL certificate files
mysql-test/mysql-test-run.pl:
  Corrected path to SSL certificate files
This commit is contained in:
unknown
2005-06-09 15:19:10 +02:00
parent f63f15e7ab
commit 62b1f1e34f
2 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
mysql-test/mysql-test-run.pl
View File

@ -1806,11 +1806,12 @@ sub mysqld_arguments ($$$$$) {
if ( $opt_with_openssl ) if ( $opt_with_openssl )
{ {
mtr_add_arg($args, "%s--ssl-ca=%s/SSL/cacert.pem", $prefix, $glob_basedir); mtr_add_arg($args, "%s--ssl-ca=%s/std_data/cacert.pem", $prefix,
mtr_add_arg($args, "%s--ssl-cert=%s/SSL/server-cert.pem", $prefix, $glob_mysql_test_dir);
$glob_basedir); mtr_add_arg($args, "%s--ssl-cert=%s/std_data/server-cert.pem", $prefix,
mtr_add_arg($args, "%s--ssl-key=%s/SSL/server-key.pem", $prefix, $glob_mysql_test_dir);
$glob_basedir); mtr_add_arg($args, "%s--ssl-key=%s/std_data/server-key.pem", $prefix,
$glob_mysql_test_dir);
} }
if ( $opt_warnings ) if ( $opt_warnings )
@ -2148,9 +2149,12 @@ sub run_mysqltest ($$) {
if ( $opt_with_openssl ) if ( $opt_with_openssl )
{ {
mtr_add_arg($args, "--ssl-ca=%s/SSL/cacert.pem", $glob_basedir); mtr_add_arg($args, "--ssl-ca=%s/std_data/cacert.pem",
mtr_add_arg($args, "--ssl-cert=%s/SSL/client-cert.pem", $glob_basedir); $glob_mysql_test_dir);
mtr_add_arg($args, "--ssl-key=%s/SSL/client-key.pem", $glob_basedir); mtr_add_arg($args, "--ssl-cert=%s/std_data/client-cert.pem",
$glob_mysql_test_dir);
mtr_add_arg($args, "--ssl-key=%s/std_data/client-key.pem",
$glob_mysql_test_dir);
} }
mtr_add_arg($args, "-R"); mtr_add_arg($args, "-R");

16
mysql-test/mysql-test-run.sh
View File

@ -299,16 +299,16 @@ while test $# -gt 0; do
--ndbcluster_port=*) NDBCLUSTER_PORT=`$ECHO "$1" | $SED -e "s;--ndbcluster_port=;;"` ;; --ndbcluster_port=*) NDBCLUSTER_PORT=`$ECHO "$1" | $SED -e "s;--ndbcluster_port=;;"` ;;
--with-openssl) --with-openssl)
EXTRA_MASTER_MYSQLD_OPT="$EXTRA_MASTER_MYSQLD_OPT \ EXTRA_MASTER_MYSQLD_OPT="$EXTRA_MASTER_MYSQLD_OPT \
--ssl-ca=$BASEDIR/SSL/cacert.pem \ --ssl-ca=$MYSQL_TEST_DIR/std_data/cacert.pem \
--ssl-cert=$BASEDIR/SSL/server-cert.pem \ --ssl-cert=$MYSQL_TEST_DIR/std_data/server-cert.pem \
--ssl-key=$BASEDIR/SSL/server-key.pem" --ssl-key=$MYSQL_TEST_DIR/std_data/server-key.pem"
EXTRA_SLAVE_MYSQLD_OPT="$EXTRA_SLAVE_MYSQLD_OPT \ EXTRA_SLAVE_MYSQLD_OPT="$EXTRA_SLAVE_MYSQLD_OPT \
--ssl-ca=$BASEDIR/SSL/cacert.pem \ --ssl-ca=$MYSQL_TEST_DIR/std_data/cacert.pem \
--ssl-cert=$BASEDIR/SSL/server-cert.pem \ --ssl-cert=$MYSQL_TEST_DIR/std_data/server-cert.pem \
--ssl-key=$BASEDIR/SSL/server-key.pem" --ssl-key=$MYSQL_TEST_DIR/std_data/server-key.pem"
MYSQL_TEST_SSL_OPTS="--ssl-ca=$BASEDIR/SSL/cacert.pem \ MYSQL_TEST_SSL_OPTS="--ssl-ca=$BASEDIR/SSL/cacert.pem \
--ssl-cert=$BASEDIR/SSL/client-cert.pem \ --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem \
--ssl-key=$BASEDIR/SSL/client-key.pem" ;; --ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem" ;;
--no-manager | --skip-manager) USE_MANAGER=0 ;; --no-manager | --skip-manager) USE_MANAGER=0 ;;
--manager) --manager)
USE_MANAGER=1 USE_MANAGER=1