[Commits] Rev 2886: Automerge mariadb 5.1 into mariadb 5.2 in file:///home/knielsen/devel/maria/my/mariadb-5.2/

knielsen at knielsen-hq.org knielsen at knielsen-hq.org
Tue Nov 23 08:26:11 EET 2010


At file:///home/knielsen/devel/maria/my/mariadb-5.2/

------------------------------------------------------------
revno: 2886 [merge]
revision-id: knielsen at knielsen-hq.org-20101123062607-uydd8xjypfzeedqv
parent: knielsen at knielsen-hq.org-20101119213347-nrsmmo52eh73mb51
parent: knielsen at knielsen-hq.org-20101123062444-y8bpq0wggf9zyxpt
committer: knielsen at knielsen-hq.org
branch nick: mariadb-5.2
timestamp: Tue 2010-11-23 07:26:07 +0100
message:
  Automerge mariadb 5.1 into mariadb 5.2
modified:
  mysql-test/t/openssl_1.test    sp1f-ssl.test-20010831211355-mk47pipvythsqcor32yidzoopgdewdo6
=== modified file 'mysql-test/t/openssl_1.test'
--- a/mysql-test/t/openssl_1.test	2010-03-04 08:03:07 +0000
+++ b/mysql-test/t/openssl_1.test	2010-11-23 06:24:44 +0000
@@ -73,6 +73,8 @@ drop table t1;
 # a different cacert
 #
 --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/
 --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
 
@@ -80,6 +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/
 --error 1
 --exec $MYSQL_TEST --ssl-ca= --max-connect-retries=1 < $MYSQLTEST_VARDIR/tmp/test.sql 2>&1
 
@@ -87,6 +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/
 --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