bzr push into mysql-5.1-telco-7.0 branch (jonas.oreland:4481 to 4482)

[jonas oreland]

 4482 jonas oreland	2011-06-28
      ndb - use UintPtr in NdbIndexStat (instead of size_t), public api

    modified:
      storage/ndb/include/ndbapi/NdbIndexStat.hpp
      storage/ndb/src/ndbapi/NdbIndexStatImpl.cpp
      storage/ndb/src/ndbapi/NdbIndexStatImpl.hpp
 4481 Jonas Oreland	2011-06-28
      ndb - fix compiler warning

    modified:
      storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp
=== modified file 'storage/ndb/include/ndbapi/NdbIndexStat.hpp'
--- a/storage/ndb/include/ndbapi/NdbIndexStat.hpp	2011-06-07 10:03:02 +0000
+++ b/storage/ndb/include/ndbapi/NdbIndexStat.hpp	2011-06-28 16:13:49 +0000
@@ -334,9 +334,9 @@ public:
   struct Mem {
     Mem();
     virtual ~Mem();
-    virtual void* mem_alloc(size_t size) = 0;
+    virtual void* mem_alloc(UintPtr size) = 0;
     virtual void mem_free(void* ptr) = 0;
-    virtual size_t mem_used() const = 0;
+    virtual UintPtr mem_used() const = 0;
   };
 
   /*

=== modified file 'storage/ndb/src/ndbapi/NdbIndexStatImpl.cpp'
--- a/storage/ndb/src/ndbapi/NdbIndexStatImpl.cpp	2011-06-16 18:16:01 +0000
+++ b/storage/ndb/src/ndbapi/NdbIndexStatImpl.cpp	2011-06-28 16:13:49 +0000
@@ -2257,7 +2257,7 @@ NdbIndexStatImpl::MemDefault::~MemDefaul
 }
 
 void*
-NdbIndexStatImpl::MemDefault::mem_alloc(size_t size)
+NdbIndexStatImpl::MemDefault::mem_alloc(UintPtr size)
 {
   if (size == 0 || size % 4 != 0)
   {
@@ -2290,7 +2290,7 @@ NdbIndexStatImpl::MemDefault::mem_free(v
   }
 }
 
-size_t
+UintPtr
 NdbIndexStatImpl::MemDefault::mem_used() const
 {
   return m_used;

=== modified file 'storage/ndb/src/ndbapi/NdbIndexStatImpl.hpp'
--- a/storage/ndb/src/ndbapi/NdbIndexStatImpl.hpp	2011-06-12 16:54:32 +0000
+++ b/storage/ndb/src/ndbapi/NdbIndexStatImpl.hpp	2011-06-28 16:13:49 +0000
@@ -281,9 +281,9 @@ public:
 
   // default memory allocator
   struct MemDefault : public Mem {
-    virtual void* mem_alloc(size_t bytes);
+    virtual void* mem_alloc(UintPtr bytes);
     virtual void mem_free(void* p);
-    virtual size_t mem_used() const;
+    virtual UintPtr mem_used() const;
     MemDefault();
     virtual ~MemDefault();
   private:

No bundle (reason: useless for push emails).