Skip to content

M
MariaDB
Commit b6a117fb authored by wax@kishkin.ru's avatar wax@kishkin.ru
Browse files
Options

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

parents 411ed6be 15e69055
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 0 deletions
BitKeeper/etc/logging_ok
View file @ b6a117fb
...@@ -107,6 +107,7 @@ vva@eagle.mysql.r18.ru ...@@ -107,6 +107,7 @@ vva@eagle.mysql.r18.ru
vva@genie.(none) vva@genie.(none)
walrus@kishkin.ru walrus@kishkin.ru
walrus@mysql.com walrus@mysql.com
wax@kishkin.ru
wax@mysql.com wax@mysql.com
worm@altair.is.lan worm@altair.is.lan
zak@balfor.local zak@balfor.local
......
sql/mysqld.cc
View file @ b6a117fb
...@@ -3344,7 +3344,9 @@ Send number of connection to client ...@@ -3344,7 +3344,9 @@ Send number of connection to client
if (!event_connect_answer) CloseHandle(event_connect_answer); if (!event_connect_answer) CloseHandle(event_connect_answer);
if (!event_connect_request) CloseHandle(event_connect_request); if (!event_connect_request) CloseHandle(event_connect_request);
pthread_mutex_lock(&LOCK_thread_count); pthread_mutex_lock(&LOCK_thread_count);
handler_count--;
pthread_mutex_unlock(&LOCK_thread_count); pthread_mutex_unlock(&LOCK_thread_count);
pthread_cond_signal(&COND_handler_count);
DBUG_RETURN(0); DBUG_RETURN(0);
} }
#endif /* HAVE_SMEM */ #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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7