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

b6a117fb · wax@kishkin.ru · 411ed6be · 15e69055 · b6a117fb · b6a117fb
Commit b6a117fb authored Mar 07, 2003 by wax@kishkin.ru
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

BitKeeper/etc/logging_ok BitKeeper/etc/logging_ok +1 -0

sql/mysqld.cc sql/mysqld.cc +2 -0

No files found.
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -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

--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -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 */