diff options
| author | unknown <gluh@gluh.(none)> | 2002-11-06 12:19:06 +0400 |
|---|---|---|
| committer | unknown <gluh@gluh.(none)> | 2002-11-06 12:19:06 +0400 |
| commit | 0e56af0744cb2d66cc44ee9685f6e94bf6e6a946 (patch) | |
| tree | 3173e0f060f7f900589641e47f2beb94e4a0d2bc /sql/sql_parse.cc | |
| parent | 444d8207d9a277231733dc6cd58bf21b626bba31 (diff) | |
| parent | 69a5dd196cc89c690b3531b75bb77f9c4a048b50 (diff) | |
| download | mariadb-git-0e56af0744cb2d66cc44ee9685f6e94bf6e6a946.tar.gz | |
Merge sgluhov@work.mysql.com:/home/bk/mysql-4.0
into gluh.(none):/home/gluh/mysql-4.0.bklast
sql/mysqld.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 7416506fd02..924fe76fe21 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -554,7 +554,13 @@ check_connections(THD *thd) { /* Do the SSL layering. */ DBUG_PRINT("info", ("IO layer change in progress...")); - sslaccept(ssl_acceptor_fd, net->vio, thd->variables.net_wait_timeout); + if (sslaccept(ssl_acceptor_fd, net->vio, thd->variables.net_wait_timeout)) + { + DBUG_PRINT("error", ("Failed to read user information (pkt_len= %lu)", + pkt_len)); + inc_host_errors(&thd->remote.sin_addr); + return(ER_HANDSHAKE_ERROR); + } DBUG_PRINT("info", ("Reading user information over SSL layer")); if ((pkt_len=my_net_read(net)) == packet_error || pkt_len < NORMAL_HANDSHAKE_SIZE) |