summaryrefslogtreecommitdiff
path: root/mysql-test/main/openssl_1.result
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2022-08-08 17:12:32 +0200
committerOleksandr Byelkin <sanja@mariadb.com>2022-08-08 17:12:32 +0200
commit1d480419822b53c840de54542c1d1a0851dbe2c8 (patch)
tree629aabba2d52741b4075c3e345396bd989516cb2 /mysql-test/main/openssl_1.result
parent3ebbfd88a0360938e3a5a480265beb2a71b1268a (diff)
parent4f54c219e7c73072d7eff1e81e0f51dc1ff47509 (diff)
downloadmariadb-git-1d480419822b53c840de54542c1d1a0851dbe2c8.tar.gz
Merge branch '10.6' into 10.7
Diffstat (limited to 'mysql-test/main/openssl_1.result')
-rw-r--r--mysql-test/main/openssl_1.result14
1 files changed, 7 insertions, 7 deletions
diff --git a/mysql-test/main/openssl_1.result b/mysql-test/main/openssl_1.result
index a9264b3ed2c..8554da4f6be 100644
--- a/mysql-test/main/openssl_1.result
+++ b/mysql-test/main/openssl_1.result
@@ -47,11 +47,11 @@ disconnect con3;
disconnect con4;
drop user ssl_user1@localhost, ssl_user3@localhost, ssl_user4@localhost, ssl_user5@localhost;
drop table t1;
-mysqltest: Could not open connection 'default': 2026 SSL connection error: xxxx
-mysqltest: Could not open connection 'default': 2026 SSL connection error: xxxx
-mysqltest: Could not open connection 'default': 2026 SSL connection error: xxxx
-mysqltest: Could not open connection 'default': 2026 SSL connection error: xxxx
-mysqltest: Could not open connection 'default': 2026 SSL connection error: xxxx
+mysqltest: Could not open connection 'default': 2026 TLS/SSL error: xxxx
+mysqltest: Could not open connection 'default': 2026 TLS/SSL error: xxxx
+mysqltest: Could not open connection 'default': 2026 TLS/SSL error: xxxx
+mysqltest: Could not open connection 'default': 2026 TLS/SSL error: xxxx
+mysqltest: Could not open connection 'default': 2026 TLS/SSL error: xxxx
have_ssl
1
End of 5.0 tests
@@ -185,7 +185,7 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-mysqldump: Got error: 2026: "SSL connection error: xxxx
+mysqldump: Got error: 2026: "TLS/SSL error: xxxx
DROP TABLE t1;
GRANT SELECT ON test.* TO bug42158@localhost REQUIRE X509;
FLUSH PRIVILEGES;
@@ -202,4 +202,4 @@ End of 5.1 tests
/*!40019 SET @@session.max_insert_delayed_threads=0*/;
/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
DELIMITER /*!*/;
-ERROR: Failed on connect: SSL connection error \ No newline at end of file
+ERROR: Failed on connect: TLS/SSL error \ No newline at end of file