Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge

into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0


client/mysql.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged

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);