Commit 64a7e9fd authored by unknown's avatar unknown

Merge kishkin.ru:/home/wax/mysql-4n into kishkin.ru:/home/wax/mysql-4nh


sql/mysqld.cc:
  Auto merged
parents 840e853e 0da0ce93
......@@ -107,6 +107,7 @@ vva@eagle.mysql.r18.ru
vva@genie.(none)
walrus@kishkin.ru
walrus@mysql.com
wax@kishkin.ru
wax@mysql.com
worm@altair.is.lan
zak@balfor.local
......
......@@ -3344,7 +3344,9 @@ Send number of connection to client
if (!event_connect_answer) CloseHandle(event_connect_answer);
if (!event_connect_request) CloseHandle(event_connect_request);
pthread_mutex_lock(&LOCK_thread_count);
handler_count--;
pthread_mutex_unlock(&LOCK_thread_count);
pthread_cond_signal(&COND_handler_count);
DBUG_RETURN(0);
}
#endif /* HAVE_SMEM */
......
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