summaryrefslogtreecommitdiff
path: root/mysql-test/t/openssl_1.test
diff options
context:
space:
mode:
authorunknown <knielsen@knielsen-hq.org>2012-01-27 15:13:38 +0100
committerunknown <knielsen@knielsen-hq.org>2012-01-27 15:13:38 +0100
commit9c922f485cf8a4edaed6a5973d6efc886bc2f89b (patch)
tree779d964bd80a34bd2d473ce72f484afd0cea272f /mysql-test/t/openssl_1.test
parent595cbf092786689aeea9d47eb210bcae65e1466b (diff)
downloadmariadb-git-9c922f485cf8a4edaed6a5973d6efc886bc2f89b.tar.gz
Fix main.openssl_1 failures for -DWITH_SSL=system build.
In 5.5, ssl_do() no longer calls report_errors() in case of ssl error. Since report_errors() iterated over the list of errors, this means that we now report the first error in the list, rather than the last. Adjust the --replace_regex line for OpenSSL build accordingly in the test case.
Diffstat (limited to 'mysql-test/t/openssl_1.test')
-rw-r--r--mysql-test/t/openssl_1.test6
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/t/openssl_1.test b/mysql-test/t/openssl_1.test
index 926d2474ff2..8b2d4455435 100644
--- a/mysql-test/t/openssl_1.test
+++ b/mysql-test/t/openssl_1.test
@@ -74,7 +74,7 @@ drop table t1;
#
--exec echo "this query should not execute;" > $MYSQLTEST_VARDIR/tmp/test.sql
# Handle that openssl gives different error messages from YaSSL.
---replace_regex /error:00000005:lib\(0\):func\(0\):DH lib/ASN: bad other signature confirmation/
+--replace_regex /error:00000001:lib\(0\):func\(0\):reason\(1\)/ASN: bad other signature confirmation/
--error 1
--exec $MYSQL_TEST --ssl-ca=$MYSQL_TEST_DIR/std_data/untrusted-cacert.pem --max-connect-retries=1 < $MYSQLTEST_VARDIR/tmp/test.sql 2>&1
@@ -82,7 +82,7 @@ drop table t1;
# Test that we can't open connection to server if we are using
# a blank ca
#
---replace_regex /error:00000005:lib\(0\):func\(0\):DH lib/ASN: bad other signature confirmation/
+--replace_regex /error:00000001:lib\(0\):func\(0\):reason\(1\)/ASN: bad other signature confirmation/
--error 1
--exec $MYSQL_TEST --ssl-ca= --max-connect-retries=1 < $MYSQLTEST_VARDIR/tmp/test.sql 2>&1
@@ -90,7 +90,7 @@ drop table t1;
# Test that we can't open connection to server if we are using
# a nonexistent ca file
#
---replace_regex /error:00000005:lib\(0\):func\(0\):DH lib/ASN: bad other signature confirmation/
+--replace_regex /error:00000001:lib\(0\):func\(0\):reason\(1\)/ASN: bad other signature confirmation/
--error 1
--exec $MYSQL_TEST --ssl-ca=nonexisting_file.pem --max-connect-retries=1 < $MYSQLTEST_VARDIR/tmp/test.sql 2>&1