bzr push into mysql-5.1-telco-7.1 branch (frazer:4114 to 4115)

[Frazer Clement]

 4115 Frazer Clement	2011-03-24
      Windows fix for CluB

    modified:
      storage/ndb/src/common/util/HashMap2.cpp
 4114 Frazer Clement	2011-03-23
      Distcheck and Windows fixes for CluB

    modified:
      sql/ha_ndbcluster_binlog.cc
      storage/ndb/src/common/util/HashMap2.cpp
      storage/ndb/src/common/util/Makefile.am
=== modified file 'storage/ndb/src/common/util/HashMap2.cpp'
--- a/storage/ndb/src/common/util/HashMap2.cpp	2011-03-23 14:53:48 +0000
+++ b/storage/ndb/src/common/util/HashMap2.cpp	2011-03-24 10:52:23 +0000
@@ -19,9 +19,9 @@
 #include <NdbTap.hpp>
 #include <HashMap2.hpp>
 
-struct HeapAlloc
+struct TestHeapAllocator
 {
-  static void* alloc(HeapAlloc* ignore, size_t bytes)
+  static void* alloc(TestHeapAllocator* ignore, size_t bytes)
   {
     void* p = ::malloc(bytes);
     printf("--Allocating %u bytes at %p\n",
@@ -29,7 +29,7 @@ struct HeapAlloc
     return p;
   }
 
-  static void free(HeapAlloc* ignore, void* mem)
+  static void free(TestHeapAllocator* ignore, void* mem)
   {
     printf("--Freeing bytes at %p\n",mem);
     ::free(mem);
@@ -98,7 +98,7 @@ TAPTEST(HashMap2)
   printf("int -> int (Static, unique) \n");
   for (int j = 1; j < 150; j ++)
   {
-    HashMap2<IntIntKVPod, true, HeapAlloc, IntIntKVStaticMethods> hash1;
+    HashMap2<IntIntKVPod, true, TestHeapAllocator, IntIntKVStaticMethods> hash1;
 
     hash1.setSize(j);
 
@@ -140,7 +140,7 @@ TAPTEST(HashMap2)
   printf("int -> int (Static, !unique) \n");
   for (int j = 1; j < 150; j ++)
   {
-    HashMap2<IntIntKVPod, false, HeapAlloc, IntIntKVStaticMethods> hash1;
+    HashMap2<IntIntKVPod, false, TestHeapAllocator, IntIntKVStaticMethods> hash1;
     
     hash1.setSize(j);
 
@@ -224,7 +224,7 @@ TAPTEST(HashMap2)
   
   printf("int -> int (Static, unique, realloc) \n");
   {
-    HashMap2<IntIntKVPod, true, HeapAlloc, IntIntKVStaticMethods> hash1;
+    HashMap2<IntIntKVPod, true, TestHeapAllocator, IntIntKVStaticMethods> hash1;
     for (int j = 1; j < 150; j ++)
     {    
       hash1.setSize(150 - j);
@@ -271,7 +271,7 @@ TAPTEST(HashMap2)
 
   printf("int -> int (Static, unique, realloc, remove) \n");
   {
-    HashMap2<IntIntKVPod, true, HeapAlloc, IntIntKVStaticMethods> hash1;
+    HashMap2<IntIntKVPod, true, TestHeapAllocator, IntIntKVStaticMethods> hash1;
     for (int j = 1; j < 150; j ++)
     {    
 //      hash1.setSize(150 - j);


Attachment: [text/bzr-bundle] bzr/[e-mail]