database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

merge 5.1->5.2

Browse Source
This commit is contained in:
unknown
2010-02-01 08:14:12 +02:00
parent f83113df07 e9bce6c9d4
commit e5099a2c85
545 changed files with 14893 additions and 6230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_connect.cc
View File

@@ -1252,6 +1252,7 @@ static int check_connection(THD *thd)
DBUG_PRINT("info", ("client capabilities: %lu", thd->client_capabilities));
if (thd->client_capabilities & CLIENT_SSL)
{
char error_string[1024];
/* Do the SSL layering. */
if (!ssl_acceptor_fd)
{
@@ -1260,7 +1261,7 @@ static int check_connection(THD *thd)
return 1;
}
DBUG_PRINT("info", ("IO layer change in progress..."));
if (sslaccept(ssl_acceptor_fd, net->vio, net->read_timeout))
if (sslaccept(ssl_acceptor_fd, net->vio, net->read_timeout, error_string))
{
DBUG_PRINT("error", ("Failed to accept new SSL connection"));
inc_host_errors(&thd->remote.sin_addr);