diff options
| author | cmiller@zippy.cornsilk.net <> | 2006-08-17 10:53:12 -0400 |
|---|---|---|
| committer | cmiller@zippy.cornsilk.net <> | 2006-08-17 10:53:12 -0400 |
| commit | 6998c5140b14f3b35a7f72c8fe9ef2b4f5f5b095 (patch) | |
| tree | 53e78f8f9537035834520b4d555619e9ccdd835b /server-tools | |
| parent | 7d38d61398b426e9ee696ea9e19d773abb91d093 (diff) | |
| parent | 747a86b114bba21bfcc4e7c18199536a66eb7304 (diff) | |
| download | mariadb-git-6998c5140b14f3b35a7f72c8fe9ef2b4f5f5b095.tar.gz | |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge
into zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
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); |