diff options
| author | unknown <Sinisa@sinisa.nasamreza.org> | 2002-05-31 13:35:20 +0300 |
|---|---|---|
| committer | unknown <Sinisa@sinisa.nasamreza.org> | 2002-05-31 13:35:20 +0300 |
| commit | 2c058d84784c67bd514ad6c879333d2c9aac8161 (patch) | |
| tree | 1386a2fca89fef4fd4163b21fd3aa282a751f46e /sql | |
| parent | 940ab3e0317ff8ebe0fc791ab83a1718481eabd0 (diff) | |
| download | mariadb-git-2c058d84784c67bd514ad6c879333d2c9aac8161.tar.gz | |
Fixed a problem with --skip-networking.
This fix should be merged into 4.0 and 4.1
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 9ac6ea6fff8..08d0f381534 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -1121,7 +1121,7 @@ void end_thread(THD *thd, bool put_in_cache) inline void kill_broken_server() { /* hack to get around signals ignored in syscalls for problem OS's */ - if (unix_sock == INVALID_SOCKET || ip_sock ==INVALID_SOCKET) + if (unix_sock == INVALID_SOCKET || (!opt_disable_networking && ip_sock ==INVALID_SOCKET)) { select_thread_in_use = 0; kill_server((void*)MYSQL_KILL_SIGNAL); /* never returns */ |