diff options
| author | hartmut@mysql.com <> | 2006-03-14 11:25:15 +0100 |
|---|---|---|
| committer | hartmut@mysql.com <> | 2006-03-14 11:25:15 +0100 |
| commit | 5e312c15812246affbb763a34d62c34a263e54cf (patch) | |
| tree | 5a698aed1110adabf505d582334a5b7c28ad3f52 /server-tools | |
| parent | 2c297c07536ff2a77498bc9b0b55414ad9e7fb05 (diff) | |
| parent | 9da74d8a5f13e188aeac5ee9d592d936e57dfcf0 (diff) | |
| download | mariadb-git-5e312c15812246affbb763a34d62c34a263e54cf.tar.gz | |
Merge mysql.com:/home/hartmut/projects/mysql/dev/5.0
into mysql.com:/home/hartmut/projects/mysql/bk-clean/5.1
Diffstat (limited to 'server-tools')
| -rw-r--r-- | server-tools/instance-manager/listener.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/server-tools/instance-manager/listener.cc b/server-tools/instance-manager/listener.cc index 67d798a1700..500b25bec03 100644 --- a/server-tools/instance-manager/listener.cc +++ b/server-tools/instance-manager/listener.cc @@ -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); |