diff options
| author | unknown <sanja@askmonty.org> | 2010-02-01 08:14:12 +0200 |
|---|---|---|
| committer | unknown <sanja@askmonty.org> | 2010-02-01 08:14:12 +0200 |
| commit | 40ceb87a9ff608566d96d9ccb8e016a4dcb7ce00 (patch) | |
| tree | 50e180dfcaa058cefb382d2ab931592cddbd007d /sql/sql_connect.cc | |
| parent | 53e3959b75dd7fc798f6b1b49f249e5649666b86 (diff) | |
| parent | 33fec9568c108d8a0c42dc51e8dad4fc1e22468d (diff) | |
| download | mariadb-git-40ceb87a9ff608566d96d9ccb8e016a4dcb7ce00.tar.gz | |
merge 5.1->5.2
Diffstat (limited to 'sql/sql_connect.cc')
| -rw-r--r-- | sql/sql_connect.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_connect.cc b/sql/sql_connect.cc index 698bebfd0f1..97abd65e5a1 100644 --- a/sql/sql_connect.cc +++ b/sql/sql_connect.cc @@ -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); |