[Commits] Rev 3597: adjust openssl_1 test as in 5.2 (no idea why this didn't merge) in file:///home/tsk/mprog/src/5.3-merge-new/

timour at askmonty.org timour at askmonty.org
Fri Nov 9 15:27:28 EET 2012


At file:///home/tsk/mprog/src/5.3-merge-new/

------------------------------------------------------------
revno: 3597
revision-id: timour at askmonty.org-20121109132713-ng18xj5e5rmfte25
parent: timour at askmonty.org-20121109110732-4wj0hpbagypf7zpq
committer: timour at askmonty.org
branch nick: 5.3-merge-new
timestamp: Fri 2012-11-09 15:27:13 +0200
message:
  adjust openssl_1 test as in 5.2 (no idea why this didn't merge)
-------------- next part --------------
=== modified file 'mysql-test/t/openssl_1.test'
--- a/mysql-test/t/openssl_1.test	2012-11-09 08:11:20 +0000
+++ b/mysql-test/t/openssl_1.test	2012-11-09 13:27:13 +0000
@@ -75,7 +75,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 /2026 SSL error.*/2026 SSL connection error: xxxx/
+--replace_regex /2026 SSL .*error.*/2026 SSL connection error: xxxx/
 --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
 --echo
@@ -85,7 +85,7 @@ drop table t1;
 # a blank ca
 #
 #--replace_regex /error:00000005:lib\(0\):func\(0\):DH lib/ASN: bad other signature confirmation/
---replace_regex /2026 SSL error.*/2026 SSL connection error: xxxx/
+--replace_regex /2026 SSL .*error.*/2026 SSL connection error: xxxx/
 --error 1
 --exec $MYSQL_TEST --ssl-ca= --max-connect-retries=1 < $MYSQLTEST_VARDIR/tmp/test.sql 2>&1
 --echo
@@ -95,7 +95,7 @@ drop table t1;
 # a nonexistent ca file
 #
 #--replace_regex /error:00000005:lib\(0\):func\(0\):DH lib/ASN: bad other signature confirmation/
---replace_regex /2026 SSL error.*/2026 SSL connection error: xxxx/
+--replace_regex /2026 SSL .*error.*/2026 SSL connection error: xxxx/
 --error 1
 --exec $MYSQL_TEST --ssl-ca=nonexisting_file.pem --max-connect-retries=1 < $MYSQLTEST_VARDIR/tmp/test.sql 2>&1
 --echo



More information about the commits mailing list