From b4a0b2c2f862ab0de853dc34e1e56f6159043e45 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Sat, 2 Jul 2011 22:12:12 +0200 Subject: post-merge fixes. most tests pass. 5.3 merge is next --- mysql-test/r/openssl_1.result | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mysql-test/r/openssl_1.result') diff --git a/mysql-test/r/openssl_1.result b/mysql-test/r/openssl_1.result index 72bbaa71da5..439930b8fe4 100644 --- a/mysql-test/r/openssl_1.result +++ b/mysql-test/r/openssl_1.result @@ -189,7 +189,7 @@ UNLOCK TABLES; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; SSL error: Unable to get private key from 'MYSQL_TEST_DIR/std_data/client-cert.pem' -mysqldump: Got error: 2026: SSL connection error: Unable to get private key when trying to connect +mysqldump: Got error: 2026: "SSL connection error: Unable to get private key" when trying to connect DROP TABLE t1; Variable_name Value Ssl_cipher DHE-RSA-AES256-SHA -- cgit v1.2.1