diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2018-12-11 18:23:54 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2018-12-12 13:25:00 +0100 |
| commit | d3ac58041e6e4d9602d1f8533416be6b090b3563 (patch) | |
| tree | 6fb89c32f7e430ce7efe06b1d1cedd40cf8bfef5 /sql/sql_acl.cc | |
| parent | 8dc460b844dcb8a8ef70396bfaf932010076b9a3 (diff) | |
| download | mariadb-git-bb-10.4-mdev16266.tar.gz | |
MDEV-16266 - New command FLUSH SSL to reload server's SSL certificate(private key,CRL,etc)bb-10.4-mdev16266
Diffstat (limited to 'sql/sql_acl.cc')
| -rw-r--r-- | sql/sql_acl.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index 3c8eceed7d4..24fa26faa72 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -12560,7 +12560,12 @@ static ulong parse_client_handshake_packet(MPVIO_EXT *mpvio, return packet_error; DBUG_PRINT("info", ("IO layer change in progress...")); - if (sslaccept(ssl_acceptor_fd, net->vio, net->read_timeout, &errptr)) + mysql_rwlock_rdlock(&LOCK_ssl_refresh); + int ssl_ret = sslaccept(ssl_acceptor_fd, net->vio, net->read_timeout, &errptr); + mysql_rwlock_unlock(&LOCK_ssl_refresh); + ssl_acceptor_stats_update(ssl_ret); + + if(ssl_ret) { DBUG_PRINT("error", ("Failed to accept new SSL connection")); return packet_error; |