diff options
| author | unknown <wax@kishkin.ru> | 2003-05-27 04:42:47 +0600 |
|---|---|---|
| committer | unknown <wax@kishkin.ru> | 2003-05-27 04:42:47 +0600 |
| commit | b68d3f459fcc8b1cd1d7797565dc6091affd4423 (patch) | |
| tree | 3971f7a3f691ea883687ebad336f04f41251b5bd /sql/mysqld.cc | |
| parent | da9bf1dec30f9d1cda414d0a96ca93c11b1a77e7 (diff) | |
| parent | 3431b9dd0c9109d830a66160a0518480ab721f21 (diff) | |
| download | mariadb-git-b68d3f459fcc8b1cd1d7797565dc6091affd4423.tar.gz | |
Merge kishkin.ru:/home/wax/mysql-4n into kishkin.ru:/home/wax/mysql-4sm
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 0f4e689d55b..86ec00e1e92 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -2281,7 +2281,9 @@ static void handle_connections_methods() #endif /* __NT__ */ if (have_tcpip && !opt_disable_networking) { +#ifdef __NT__ handler_count++; +#endif if (pthread_create(&hThread,&connection_attrib, handle_connections_sockets, 0)) { @@ -2292,7 +2294,9 @@ static void handle_connections_methods() #ifdef HAVE_SMEM if (opt_enable_shared_memory) { +#ifdef __NT__ handler_count++; +#endif if (pthread_create(&hThread,&connection_attrib, handle_connections_shared_memory, 0)) { @@ -3318,10 +3322,12 @@ error: if (!handle_connect_file_map) CloseHandle(handle_connect_file_map); if (!event_connect_answer) CloseHandle(event_connect_answer); if (!event_connect_request) CloseHandle(event_connect_request); +#ifdef __NT__ pthread_mutex_lock(&LOCK_thread_count); handler_count--; pthread_mutex_unlock(&LOCK_thread_count); pthread_cond_signal(&COND_handler_count); +#endif DBUG_RETURN(0); } #endif /* HAVE_SMEM */ |