bk commit into 5.0 tree (jonas:1.2050)

[jonas]

Below is the list of changes that have just been committed into a local
5.0 repository of jonas. When jonas 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.2050 06/03/09 11:11:08 jonas@stripped +1 -0
  Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
  into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0

  ndb/src/kernel/blocks/suma/Suma.hpp
    1.5 06/03/09 11:11:04 jonas@stripped +0 -0
    Auto merged

# 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:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/mysql-5.0/RESYNC

--- 1.4/ndb/src/kernel/blocks/suma/Suma.hpp	2005-10-04 20:05:53 +02:00
+++ 1.5/ndb/src/kernel/blocks/suma/Suma.hpp	2006-03-09 11:11:04 +01:00
@@ -241,7 +241,8 @@
     void runDROP_TRIG_REF(Signal* signal);
     void runDropTrig(Signal* signal, Uint32 triggerId, Uint32 tableId);
 
-    union { Uint32 nextPool; Uint32 nextList; Uint32 ptrI; };
+    Uint32 ptrI;
+    union { Uint32 nextPool; Uint32 nextList; };
   };
   friend struct SyncRecord;