[Commits] Rev 3248: Fix main.openssl_1 failures for -DWITH_SSL=system build. in http://bazaar.launchpad.net/~maria-captains/maria/5.5

knielsen at knielsen-hq.org knielsen at knielsen-hq.org
Fri Jan 27 16:13:38 EET 2012


At http://bazaar.launchpad.net/~maria-captains/maria/5.5

------------------------------------------------------------
revno: 3248
revision-id: knielsen at knielsen-hq.org-20120127141338-dr0sf792pv0jnldm
parent: knielsen at knielsen-hq.org-20120127111441-kmrv1my0t567sji9
committer: knielsen at knielsen-hq.org
branch nick: mariadb-5.5
timestamp: Fri 2012-01-27 15:13:38 +0100
message:
  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.
=== modified file 'mysql-test/t/openssl_1.test'
--- a/mysql-test/t/openssl_1.test	2011-10-19 19:45:18 +0000
+++ b/mysql-test/t/openssl_1.test	2012-01-27 14:13:38 +0000
@@ -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
 



More information about the commits mailing list