bk commit into 4.1 tree (joerg:1.2117)

[Joerg Bruehe]

Below is the list of changes that have just been committed into a local
4.1 repository of joerg. When joerg 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.2117 05/03/15 12:40:28 joerg@stripped +1 -0
  Proactive compile fix (in case we ever enable "EVENT_DEBUG" on IRIX).

  ndb/src/ndbapi/NdbEventOperationImpl.cpp
    1.9 05/03/15 12:40:25 joerg@stripped +3 -2
    Proactive compile fix (in case we ever enable "EVENT_DEBUG" on IRIX):
    Two identical declarations on loop level will collide at function level.

# 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:	joerg
# Host:	trift2.
# Root:	/M41/push-4.1

--- 1.8/ndb/src/ndbapi/NdbEventOperationImpl.cpp	Mon Oct 25 17:21:38 2004
+++ 1.9/ndb/src/ndbapi/NdbEventOperationImpl.cpp	Tue Mar 15 12:40:25 2005
@@ -362,12 +362,13 @@
     Uint32 *aDataPtr = ptr[1].p;
 
 #ifdef EVENT_DEBUG
+    int i;
     printf("after values sz=%u\n", ptr[1].sz);
-    for(int i=0; i < ptr[1].sz; i++)
+    for (i=0; i < ptr[1].sz; i++)
       printf ("H'%.8X ",ptr[1].p[i]);
     printf("\n");
     printf("before values sz=%u\n", ptr[2].sz);
-    for(int i=0; i < ptr[2].sz; i++)
+    for (i=0; i < ptr[2].sz; i++)
       printf ("H'%.8X ",ptr[2].p[i]);
     printf("\n");
 #endif