bk commit into 5.1 tree (tomas:1.2508)

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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@stripped, 2007-05-07 12:10:27+02:00, tomas@stripped +1 -0
  use Uint32 instead of uint to enable compile independent of mysql types

  storage/ndb/include/ndbapi/NdbBlob.hpp@stripped, 2007-05-07 12:10:24+02:00, tomas@stripped +3 -3
    use Uint32 instead of uint to enable compile independent of mysql types

# 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:	tomas
# Host:	whalegate.ndb.mysql.com
# Root:	/home/tomas/telco-6.2.2

--- 1.30/storage/ndb/include/ndbapi/NdbBlob.hpp	2007-04-08 17:08:10 +02:00
+++ 1.31/storage/ndb/include/ndbapi/NdbBlob.hpp	2007-05-07 12:10:24 +02:00
@@ -162,7 +162,7 @@
     Uint32 pkid;        // connects part and row with same PK within tx
     Uint64 length;      // blob length
     //
-    uint headsize;    // for convenience, number of bytes in head
+    Uint32 headsize;    // for convenience, number of bytes in head
     Head() :
       varsize(0), reserved(0), pkid(0), length(0), headsize(0) {}
   };
@@ -295,8 +295,8 @@
    * Use following flag.  It is always set for V1.
    */
   bool theFixedDataFlag;
-  uint theHeadSize;
-  uint theVarsizeBytes;
+  Uint32 theHeadSize;
+  Uint32 theVarsizeBytes;
   // state
   State theState;
   void setState(State newState);