bzr commit into mysql-5.1-telco-6.3 branch (magnus.blaudd:3413)

[Magnus Blåudd]

#At file:///data0/magnus/mysql/6.3/ based on revid:magnus.blaudd@stripped

 3413 Magnus Blåudd	2011-04-07
      ndb
       - fix win64 problem (where InvalidId is an enum) by explicitly casting
         InvalidId to UInt32

    modified:
      storage/ndb/src/ndbapi/ObjectMap.cpp
      storage/ndb/src/ndbapi/ObjectMap.hpp
=== modified file 'storage/ndb/src/ndbapi/ObjectMap.cpp'
--- a/storage/ndb/src/ndbapi/ObjectMap.cpp	2011-02-01 21:05:11 +0000
+++ b/storage/ndb/src/ndbapi/ObjectMap.cpp	2011-04-07 12:35:09 +0000
@@ -50,7 +50,7 @@ int NdbObjectIdMap::expand(Uint32 incSiz
       m_map[i].m_next = i + 1;
     }
     m_firstFree = m_size;
-    m_map[newSize-1].m_next = InvalidId;
+    m_map[newSize-1].m_next = Uint32(InvalidId);
     m_size = newSize;
   }
   else

=== modified file 'storage/ndb/src/ndbapi/ObjectMap.hpp'
--- a/storage/ndb/src/ndbapi/ObjectMap.hpp	2011-02-01 21:05:11 +0000
+++ b/storage/ndb/src/ndbapi/ObjectMap.hpp	2011-04-07 12:35:09 +0000
@@ -61,7 +61,7 @@ NdbObjectIdMap::map(void * object){
   
   //  lock();
   
-  if(m_firstFree == InvalidId && expand(m_expandSize))
+  if(m_firstFree == (InvalidId) && expand(m_expandSize))
     return InvalidId;
   
   Uint32 ff = m_firstFree;

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