bk commit into 5.0 tree (hartmut:1.2085) BUG#14995

['Hartmut Holzgraefe']

Below is the list of changes that have just been committed into a local
5.0 repository of hartmut. When hartmut does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2085 06/03/14 11:13:41 hartmut@stripped +1 -0
  relying on loop counter variables being local to the loop body if 
  declared in the 'for' statement is not portable, some compilers
  still don't implement this ANSI C++ specification (Bug #14995)

  server-tools/instance-manager/listener.cc
    1.25 06/03/14 11:13:32 hartmut@stripped +4 -4
    relying on loop counter variables being local to the loop body if 
    declared in the 'for' statement is not portable, some compilers
    still don't implement this ANSI C++ specification (Bug #14995)

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	hartmut
# Host:	linux.site
# Root:	/home/hartmut/projects/mysql/dev/5.0

--- 1.24/server-tools/instance-manager/listener.cc	2005-10-28 12:48:27 +02:00
+++ 1.25/server-tools/instance-manager/listener.cc	2006-03-14 11:13:32 +01:00
@@ -88,7 +88,7 @@
 
 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 @@
 #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 @@
 
   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 @@
 
 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);