Commit 62b1f1e3 authored by unknown's avatar unknown
Browse files

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
parent f63f15e7

mysql-test/mysql-test-run.pl

+12 −8
Original line number Diff line number Diff line
@@ -1806,11 +1806,12 @@ sub mysqld_arguments ($$$$$) { 


  if ( $opt_with_openssl )

  {

    mtr_add_arg($args, "%s--ssl-ca=%s/SSL/cacert.pem", $prefix, $glob_basedir);

    mtr_add_arg($args, "%s--ssl-cert=%s/SSL/server-cert.pem", $prefix,

                $glob_basedir);

    mtr_add_arg($args, "%s--ssl-key=%s/SSL/server-key.pem", $prefix,

                $glob_basedir);

    mtr_add_arg($args, "%s--ssl-ca=%s/std_data/cacert.pem", $prefix,

                $glob_mysql_test_dir);

    mtr_add_arg($args, "%s--ssl-cert=%s/std_data/server-cert.pem", $prefix,

                $glob_mysql_test_dir);

    mtr_add_arg($args, "%s--ssl-key=%s/std_data/server-key.pem", $prefix,

                $glob_mysql_test_dir);

  }



  if ( $opt_warnings )
@@ -2148,9 +2149,12 @@ sub run_mysqltest ($$) { 


  if ( $opt_with_openssl )

  {

    mtr_add_arg($args, "--ssl-ca=%s/SSL/cacert.pem", $glob_basedir);

    mtr_add_arg($args, "--ssl-cert=%s/SSL/client-cert.pem", $glob_basedir);

    mtr_add_arg($args, "--ssl-key=%s/SSL/client-key.pem", $glob_basedir);

    mtr_add_arg($args, "--ssl-ca=%s/std_data/cacert.pem",

                $glob_mysql_test_dir);

    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");

mysql-test/mysql-test-run.sh

+8 −8
Original line number Diff line number Diff line
@@ -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