summaryrefslogtreecommitdiff
path: root/mysql-test/mysql-test-run.sh
diff options
context:
space:
mode:
authorunknown <kent@mysql.com>2005-06-09 15:19:10 +0200
committerunknown <kent@mysql.com>2005-06-09 15:19:10 +0200
commitd5999fc1ff0eace7edf6e32028434d1d945a284d (patch)
treedbe784fd370d9e5e7d3c2b59a975550de272b015 /mysql-test/mysql-test-run.sh
parentbf89d92f76c6f162fdc0b884306b3bab39e269a9 (diff)
downloadmariadb-git-d5999fc1ff0eace7edf6e32028434d1d945a284d.tar.gz
mysql-test-run.pl, mysql-test-run.sh:
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
Diffstat (limited to 'mysql-test/mysql-test-run.sh')
-rw-r--r--mysql-test/mysql-test-run.sh16
1 files changed, 8 insertions, 8 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh
index bdd92e7941b..8ef13d7154d 100644
--- a/mysql-test/mysql-test-run.sh
+++ b/mysql-test/mysql-test-run.sh
@@ -299,16 +299,16 @@ while test $# -gt 0; do
--ndbcluster_port=*) NDBCLUSTER_PORT=`$ECHO "$1" | $SED -e "s;--ndbcluster_port=;;"` ;;
--with-openssl)
EXTRA_MASTER_MYSQLD_OPT="$EXTRA_MASTER_MYSQLD_OPT \
- --ssl-ca=$BASEDIR/SSL/cacert.pem \
- --ssl-cert=$BASEDIR/SSL/server-cert.pem \
- --ssl-key=$BASEDIR/SSL/server-key.pem"
+ --ssl-ca=$MYSQL_TEST_DIR/std_data/cacert.pem \
+ --ssl-cert=$MYSQL_TEST_DIR/std_data/server-cert.pem \
+ --ssl-key=$MYSQL_TEST_DIR/std_data/server-key.pem"
EXTRA_SLAVE_MYSQLD_OPT="$EXTRA_SLAVE_MYSQLD_OPT \
- --ssl-ca=$BASEDIR/SSL/cacert.pem \
- --ssl-cert=$BASEDIR/SSL/server-cert.pem \
- --ssl-key=$BASEDIR/SSL/server-key.pem"
+ --ssl-ca=$MYSQL_TEST_DIR/std_data/cacert.pem \
+ --ssl-cert=$MYSQL_TEST_DIR/std_data/server-cert.pem \
+ --ssl-key=$MYSQL_TEST_DIR/std_data/server-key.pem"
MYSQL_TEST_SSL_OPTS="--ssl-ca=$BASEDIR/SSL/cacert.pem \
- --ssl-cert=$BASEDIR/SSL/client-cert.pem \
- --ssl-key=$BASEDIR/SSL/client-key.pem" ;;
+ --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem \
+ --ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem" ;;
--no-manager | --skip-manager) USE_MANAGER=0 ;;
--manager)
USE_MANAGER=1