summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authortonu@volk.internalnet <>2001-11-01 19:10:55 +0200
committertonu@volk.internalnet <>2001-11-01 19:10:55 +0200
commit6c4c103a773f06320013dd09b03df9d5848beb98 (patch)
tree199dc97b66438432ddaf7f0f04fa2bf786e66a69 /sql
parent24805fc7483bb2b071b63f1c5d740815d2bfb4b0 (diff)
downloadmariadb-git-6c4c103a773f06320013dd09b03df9d5848beb98.tar.gz
SSL timeout bug fixed. Timeout was constant 60 seconds instead of 28800
Diffstat (limited to 'sql')
-rw-r--r--sql/sql_parse.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index f8bc02c9f19..767ef41e848 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -433,7 +433,7 @@ check_connections(THD *thd)
DBUG_PRINT("info", ("Agreed to change IO layer to SSL") );
/* Do the SSL layering. */
DBUG_PRINT("info", ("IO layer change in progress..."));
- sslaccept(ssl_acceptor_fd, net->vio, (long)60L);
+ sslaccept(ssl_acceptor_fd, net->vio, thd->inactive_timeout);
DBUG_PRINT("info", ("Reading user information over SSL layer"));
if ((pkt_len=my_net_read(net)) == packet_error ||
pkt_len < NORMAL_HANDSHAKE_SIZE)