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)