bzr commit into mysql-5.1-telco-7.0-wl4124-new0 branch (pekka.nousiainen:4392) WL#4124

[Pekka Nousiainen]

#At file:///export/space/pekka/ms/ms-wl4124-70/ based on revid:pekka.nousiainen@stripped

 4392 Pekka Nousiainen	2011-06-06
      wl#4124 x06_fix.diff
      some warnings (mainly int sizes)

    modified:
      storage/ndb/src/ndbapi/NdbIndexStat.cpp
      storage/ndb/src/ndbapi/NdbIndexStatImpl.hpp
      storage/ndb/test/ndbapi/testIndexStat.cpp
=== modified file 'storage/ndb/src/ndbapi/NdbIndexStat.cpp'
--- a/storage/ndb/src/ndbapi/NdbIndexStat.cpp	2011-06-06 12:18:27 +0000
+++ b/storage/ndb/src/ndbapi/NdbIndexStat.cpp	2011-06-06 18:23:15 +0000
@@ -393,8 +393,8 @@ NdbIndexStat::get_cache_info(CacheInfo&
     info.m_valid += c->m_valid;
     info.m_sampleCount += c->m_sampleCount;
     info.m_totalBytes += c->m_keyBytes + c->m_valueBytes + c->m_addrBytes;
-    info.m_save_time += (Uint64)c->m_save_time;
-    info.m_sort_time += (Uint64)c->m_sort_time;
+    info.m_save_time += c->m_save_time;
+    info.m_sort_time += c->m_sort_time;
     c = c->m_nextClean;
   }
   // build and query cache have at most one instance

=== modified file 'storage/ndb/src/ndbapi/NdbIndexStatImpl.hpp'
--- a/storage/ndb/src/ndbapi/NdbIndexStatImpl.hpp	2011-06-06 12:18:27 +0000
+++ b/storage/ndb/src/ndbapi/NdbIndexStatImpl.hpp	2011-06-06 18:23:15 +0000
@@ -30,7 +30,8 @@ class NdbIndexScanOperation;
 class NdbRecAttr;
 class NdbOperation;
 
-struct NdbIndexStatImpl : public NdbIndexStat {
+class NdbIndexStatImpl : public NdbIndexStat {
+public:
   friend class NdbIndexStat;
   struct Con;
   struct Cache;
@@ -174,8 +175,8 @@ struct NdbIndexStatImpl : public NdbInde
     Uint8* m_valueArray;
     Cache* m_nextClean;
     // performance
-    mutable int m_save_time;
-    mutable int m_sort_time;
+    mutable Uint64 m_save_time;
+    mutable Uint64 m_sort_time;
     Cache();
     // pos is index < sampleCount, addr is offset in keyArray
     uint get_keyaddr(uint pos) const;
@@ -284,7 +285,7 @@ struct NdbIndexStatImpl : public NdbInde
     enum { MemMagic = 0xf1f2f3f4 };
     struct Item {
       Uint32 m_magic;
-      Uint32 m_size;
+      size_t m_size;
     };
     size_t m_used;
   };

=== modified file 'storage/ndb/test/ndbapi/testIndexStat.cpp'
--- a/storage/ndb/test/ndbapi/testIndexStat.cpp	2011-06-06 12:18:27 +0000
+++ b/storage/ndb/test/ndbapi/testIndexStat.cpp	2011-06-06 18:23:15 +0000
@@ -583,7 +583,6 @@ Key::Key()
 
 static Key* g_keys = 0;
 static uint* g_sortkeys = 0;
-static uint g_sortcount = 0;
 
 static void
 freekeys()


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