Commit 0c403173 authored by tonu@x153.internalnet's avatar tonu@x153.internalnet
Browse files

SSL fixes

parent d02c295d

mysql-test/mysql-test-run.sh

+7 −7
Original line number Diff line number Diff line
@@ -140,13 +140,13 @@ while test $# -gt 0; do 
    --slave_port=*) SLAVE_MYPORT=`$ECHO "$1" | $SED -e "s;--slave_port=;;"` ;;

    --with-openssl)

     EXTRA_MASTER_MYSQLD_OPT="$EXTRA_MASTER_MYSQLD_OPT \

     --ssl-ca=../SSL/cacert.pem \

     --ssl-cert=../SSL/server-cert.pem \

     --ssl-key=../SSL/server-key.pem"

     --ssl-ca=$BASEDIR/SSL/cacert.pem \

     --ssl-cert=$BASEDIR/SSL/server-cert.pem \

     --ssl-key=$BASEDIR/SSL/server-key.pem"

     EXTRA_SLAVE_MYSQLD_OPT="$EXTRA_SLAVE_MYSQLD_OPT \

     --ssl-ca=../SSL/cacert.pem \

     --ssl-cert=../SSL/server-cert.pem \

     --ssl-key=../SSL/server-key.pem" ;;

     --ssl-ca=$BASEDIR/SSL/cacert.pem \

     --ssl-cert=$BASEDIR/SSL/server-cert.pem \

     --ssl-key=$BASEDIR/SSL/server-key.pem" ;;

    --skip-innobase)

     EXTRA_MASTER_MYSQLD_OPT="$EXTRA_MASTER_MYSQLD_OPT --skip-innobase"

     EXTRA_SLAVE_MYSQLD_OPT="$EXTRA_SLAVE_MYSQLD_OPT --skip-innobase" ;;