database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge mysql.com:/home/hartmut/projects/mysql/dev/5.0

Browse Source 
into  mysql.com:/home/hartmut/projects/mysql/bk-clean/5.1


mysql-test/mysql-test-run.pl:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
This commit is contained in:
unknown
2006-03-14 11:25:15 +01:00
parent 0430352bdb 07919a4d13
commit b34f450021
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server-tools/instance-manager/listener.cc
View File

@ -88,7 +88,7 @@ Listener_thread::~Listener_thread()
void Listener_thread::run()
{
int n= 0;
int i, n= 0;
#ifndef __WIN__
/* we use this var to check whether we are running on LinuxThreads */
@ -117,7 +117,7 @@ void Listener_thread::run()
#endif
/* II. Listen sockets and spawn childs */
for (int i= 0; i < num_sockets; i++)
for (i= 0; i < num_sockets; i++)
n= max(n, sockets[i]);
n++;
@ -176,7 +176,7 @@ void Listener_thread::run()
log_info("Listener_thread::run(): shutdown requested, exiting...");
for (int i= 0; i < num_sockets; i++)
for (i= 0; i < num_sockets; i++)
close(sockets[i]);
#ifndef __WIN__
@ -189,7 +189,7 @@ void Listener_thread::run()
err:
// we have to close the ip sockets in case of error
for (int i= 0; i < num_sockets; i++)
for (i= 0; i < num_sockets; i++)
close(sockets[i]);
thread_registry.unregister_thread(&thread_info);