diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2019-01-31 22:08:45 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2019-01-31 22:12:24 +0100 |
| commit | 20e19f69750466ac2c9bbf82ef5ba396fc842a08 (patch) | |
| tree | 630924379327a3ef9906541eabdc547b4a6f401c /sql | |
| parent | b8aef87221c46c82921377f18a6498a31f7e5367 (diff) | |
| download | mariadb-git-20e19f69750466ac2c9bbf82ef5ba396fc842a08.tar.gz | |
MDEV-17479 Assertion `mysql_socket.fd != -1' failed in inline_mysql_socket_send on server shutdown
Do not try to write ER_SHUTDOWN error message to socket, when it is forcefully closed by the shutdown.
This will avoid the race condition (attempt to write to closed socket, if connection shuts down by itself).
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysqld.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 77736607e22..9240622cadf 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -1791,7 +1791,7 @@ static void close_connections(void) */ THD* save_thd= current_thd; set_current_thd(tmp); - close_connection(tmp,ER_SERVER_SHUTDOWN); + close_connection(tmp); set_current_thd(save_thd); } #endif |