diff options
| author | Tatjana Azundris Nuernberg <tatjana.nuernberg@oracle.com> | 2011-05-26 13:33:21 +0100 |
|---|---|---|
| committer | Tatjana Azundris Nuernberg <tatjana.nuernberg@oracle.com> | 2011-05-26 13:33:21 +0100 |
| commit | e1b79597f66ee22a8accfd12d8180f9b7ea5ae81 (patch) | |
| tree | 112b4af13e2ffde434ce531c3538c9db7f2e07c3 /sql/sql_acl.cc | |
| parent | add86aaddc406b00b66f70798f466d30c125cbd4 (diff) | |
| parent | cf80c6cb642d5f82a53f38a41742c94a2c768dbf (diff) | |
| download | mariadb-git-e1b79597f66ee22a8accfd12d8180f9b7ea5ae81.tar.gz | |
auto-merge Bug#11745920
Diffstat (limited to 'sql/sql_acl.cc')
| -rw-r--r-- | sql/sql_acl.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index 60658c040ab..44e42c86228 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -8527,14 +8527,14 @@ static ulong parse_client_handshake_packet(MPVIO_EXT *mpvio, DBUG_PRINT("info", ("client capabilities: %lu", mpvio->client_capabilities)); if (mpvio->client_capabilities & CLIENT_SSL) { - char error_string[1024] __attribute__((unused)); + unsigned long errptr; /* Do the SSL layering. */ if (!ssl_acceptor_fd) return packet_error; 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, &errptr)) { DBUG_PRINT("error", ("Failed to accept new SSL connection")); return packet_error; |