diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-21 11:45:00 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-21 11:45:00 +0300 |
commit | 4930f9c94bb610f4d76b73a8b6b351d9fa9c5d68 (patch) | |
tree | ed6b2754116233ca8a39515c7ba06e09b2a8cdc8 /mysql-test/main/ssl_timeout.result | |
parent | 502b769561760f35d2b612ab984906c8a4bb9b51 (diff) | |
parent | d104fe6f734df2aebe24b3e5e3dbc189a5302920 (diff) | |
download | mariadb-git-4930f9c94bb610f4d76b73a8b6b351d9fa9c5d68.tar.gz |
Merge 10.5 into 10.6
Diffstat (limited to 'mysql-test/main/ssl_timeout.result')
-rw-r--r-- | mysql-test/main/ssl_timeout.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/main/ssl_timeout.result b/mysql-test/main/ssl_timeout.result index 3c94a9927da..e0d1dbed69f 100644 --- a/mysql-test/main/ssl_timeout.result +++ b/mysql-test/main/ssl_timeout.result @@ -5,6 +5,6 @@ SELECT (VARIABLE_VALUE <> '') AS have_ssl FROM INFORMATION_SCHEMA.SESSION_STATUS have_ssl 1 SELECT SLEEP(600); -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query connection default; disconnect ssl_con; |