diff options
| author | unknown <wax@kishkin.ru> | 2003-05-21 04:57:59 +0600 |
|---|---|---|
| committer | unknown <wax@kishkin.ru> | 2003-05-21 04:57:59 +0600 |
| commit | 3431b9dd0c9109d830a66160a0518480ab721f21 (patch) | |
| tree | dff0ef61362ce151abfcb03cdf026defad507d8c /sql | |
| parent | c121cb748d9432561664ad020c3c48431fe2a48c (diff) | |
| download | mariadb-git-3431b9dd0c9109d830a66160a0518480ab721f21.tar.gz | |
add check of __NT__ definition for shared_memory for tree 4.1
Diffstat (limited to 'sql')
| -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 f73bd6721f0..e11729e0876 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -2327,7 +2327,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)) { @@ -2338,7 +2340,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)) { @@ -3364,10 +3368,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 */ |