Commit 2c058d84 authored by unknown's avatar unknown

Fixed a problem with --skip-networking.

This fix should be merged into 4.0 and 4.1

parent 940ab3e0
......@@ -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 */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment