summaryrefslogtreecommitdiff
path: root/mysql-test/t/openssl_1.test
diff options
context:
space:
mode:
authormsvensson@pilot.blaudden <>2007-04-11 21:03:29 +0200
committermsvensson@pilot.blaudden <>2007-04-11 21:03:29 +0200
commit900e0d685dc78289da19d62ba687ccfe23a53699 (patch)
tree3e16a1d16742f09632a13ec2babc4a1a10e0a885 /mysql-test/t/openssl_1.test
parente81cb86952ab366ae20aa8186041dde3be66d166 (diff)
parent82b454aa28e46efa9249ee51784b654fbd0a9225 (diff)
downloadmariadb-git-900e0d685dc78289da19d62ba687ccfe23a53699.tar.gz
Merge pilot.blaudden:/home/msvensson/mysql/bug21611/my50-bug21611
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
Diffstat (limited to 'mysql-test/t/openssl_1.test')
-rw-r--r--mysql-test/t/openssl_1.test8
1 files changed, 8 insertions, 0 deletions
diff --git a/mysql-test/t/openssl_1.test b/mysql-test/t/openssl_1.test
index dbe8bdd8940..4d0e6a8d9d1 100644
--- a/mysql-test/t/openssl_1.test
+++ b/mysql-test/t/openssl_1.test
@@ -97,6 +97,14 @@ drop table t1;
--exec $MYSQL_TEST --ssl-cert= --max-connect-retries=1 < $MYSQLTEST_VARDIR/tmp/test.sql 2>&1
#
+# BUG#21611 Slave can't connect when master-ssl-cipher specified
+# - Apparently selecting a cipher doesn't work at all
+# - Usa a cipher that both yaSSL and OpenSSL supports
+#
+--exec echo "SHOW STATUS LIKE 'Ssl_cipher';" > $MYSQLTEST_VARDIR/tmp/test.sql
+--exec $MYSQL_TEST --ssl-cipher=DHE-RSA-AES256-SHA < $MYSQLTEST_VARDIR/tmp/test.sql 2>&1
+
+#
# Bug#25309 SSL connections without CA certificate broken since MySQL 5.0.23
#
# Test that we can open encrypted connection to server without