mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 13:32:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
sql/mysqld.cc:
  Auto merged
This commit is contained in:
unknown 2003-05-27 04:42:47 +06:00
commit b68d3f459f
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sql/mysqld.cc
View file

@ -2281,7 +2281,9 @@ static void handle_connections_methods()
#endif /* __NT__ */ #endif /* __NT__ */
if (have_tcpip && !opt_disable_networking) if (have_tcpip && !opt_disable_networking)
{ {
#ifdef __NT__
handler_count++; handler_count++;
#endif
if (pthread_create(&hThread,&connection_attrib, if (pthread_create(&hThread,&connection_attrib,
handle_connections_sockets, 0)) handle_connections_sockets, 0))
{ {
@ -2292,7 +2294,9 @@ static void handle_connections_methods()
#ifdef HAVE_SMEM #ifdef HAVE_SMEM
if (opt_enable_shared_memory) if (opt_enable_shared_memory)
{ {
#ifdef __NT__
handler_count++; handler_count++;
#endif
if (pthread_create(&hThread,&connection_attrib, if (pthread_create(&hThread,&connection_attrib,
handle_connections_shared_memory, 0)) handle_connections_shared_memory, 0))
{ {
@ -3318,10 +3322,12 @@ error:
if (!handle_connect_file_map) CloseHandle(handle_connect_file_map); if (!handle_connect_file_map) CloseHandle(handle_connect_file_map);
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);
#ifdef __NT__
pthread_mutex_lock(&LOCK_thread_count); pthread_mutex_lock(&LOCK_thread_count);
handler_count--; handler_count--;
pthread_mutex_unlock(&LOCK_thread_count); pthread_mutex_unlock(&LOCK_thread_count);
pthread_cond_signal(&COND_handler_count); pthread_cond_signal(&COND_handler_count);
#endif
DBUG_RETURN(0); DBUG_RETURN(0);
} }
#endif /* HAVE_SMEM */ #endif /* HAVE_SMEM */