From: Pekka Nousiainen
Date: June 6 2011 6:23pm
Subject: bzr commit into mysql-5.1-telco-7.0-wl4124-new0 branch
 (pekka.nousiainen:4392) WL#4124
List-Archive: http://lists.mysql.com/commits/138727
Message-Id: <20110606182321.4E62F5586E@sama.localdomain>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0688589830=="

--===============0688589830==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#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()


--===============0688589830==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/pekka.nousiainen@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: pekka.nousiainen@stripped\
#   ie7hvcckpxsppl60
# target_branch: file:///export/space/pekka/ms/ms-wl4124-70/
# testament_sha1: 3a8e006050af752914144b9f0f7fd51d86611cc1
# timestamp: 2011-06-06 21:23:21 +0300
# source_branch: bzr+ssh://pnousiainen@stripped/bzrroot\
#   /server/mysql-5.1-telco-7.0/
# base_revision_id: pekka.nousiainen@stripped\
#   l3amzcgo5ybujhat
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWRw7oe8AAsTfgFAQWGv//1Ih
SgC////4UAXM8ApUogoBVRYMlT1Ghk02k9Caek0AAA0GgAcwAAAAAAAAAAJFEyGgQymU09T01NqA
Y1NDENAHMAAAAAAAAAACSiZTyABMnpAaTFT1P1RtRppkxNPSKIfgjbKJUqHnFRTIJkq10R4hTbSR
QgBqGwgKpi7ZcJOyuyuX+pzzSVSKY8zcu5WJpttsPH6ov/MrenlnVpVYo2DNHBzebrtlGxzflfhq
79Z7xry/vg89H0Lza62DmCi+bbfn05XfZbTdmDNvLJJzEJ/IrnaUFAqQDiXSOJvxxBYK8+rVpvTi
Yuq2x3ICgXvkuxJAZqN1s6mL1i3YIOjgaxNrNwSYIJt5UYzkCJAmNkBA0cAXdB9BKmJ9aScsQ5Wl
TbH0Dzon3IOfx1cIHaSOLc7BBEc+sVpidYXv5ZYW3bRyL6bQ1t3CJF5ClpaXFTz2vEbU8Ys90HkK
C9bRhct1zQlH2nT25DBIcZUioIiGm0NCZOIlBEjeTlhc1KBfukXUH3rKAndLZmrX2CM5pMwJxuwi
Rq8ycCegyz1G9ZGBWXE7iDMCOCOdthIq2YYlCT2BUwlhcS/BvIhZOmQ3pg4sDCosLax5MwvOx7lx
ZRQNaqRFQ5o4sGnHZ0q997aNCls8WjjA5PipLWKUzPhxPifD4LPGzS8vG0pAhsV7EYmpM5l2JHea
EDYanOY2HMZXWiugadC0cVQCQwMH3EKVBita4xkOkjpL6WcYwpiidC1WkIVm8RM0JSpc7o6GBCKF
tM4HDljFXExyllJ3Yx11FpfVXQ4rZPSQKwcaInOYymGeExsIDS666KTIv1VMT3MaY5ZBs1XRjqct
cArlFE0oVuYSFXJx2o7Qp4Hqqo2NadiYobfFezqJoC6Y2xp/iFDiNmFG3w7UQNtdLFBI3EPdzyUU
2mrybcUzutaA6jfGwCRMchpocA/PUqOVHnsgOZdeRqmx2IOJ7CDLEbuVuShUvFqDvieKp0mMKk1p
YvO1ZlJK0Z2SeMXAy4kwQPI01/hdwWnUsUZjU6lwzQYPfwOJ5Ea/qehThkc1GilmQjCZAb/ggM2C
nL5WKMIjjv3zK+NqOD6EcB18Ev9CYRqYtLGJGPAONZnR7UHZDGCKGBy6DPoUaj3E++4RS9ppq0oy
2FyrQT9a8VVsuO5x061sOROS/EkA++dmX0aQEHgL0xG/GyyqaUnjGEBQSGpTSttBi7kjM9Jh+g1u
3hOFiN5kfdb16r8uNFMdSgrKhG8qKlHemjALD5KiJ6LEFsnLgOKu0HiDh18DG3fDNJiRDmionMEh
wjd+oEiYYYiC/7Fc0PyfjjKNYuAvS2ZGTPXu4+CgrTyamQgkTmJoL4nIQcHlnxKBGpVr6j2qcK1N
SYieI23QCnkdE1AME0wlnHLuXgFQzt51Gsb07L6FpBgWLVpq5zg9x43HuPTsoIYgGVrMlIXrFvPL
xqMEMVrEiWrwI6IB4MYm0NcjwuqhoXYoDoyIu2w90B5QUL0Irm5YfLVAOQcJpZG/g00SJBAXpPSD
UPldwUwrEfEf22iZuLBHimz9NykoCImRZ7LkqTVYCFpaQQW2WhP6WKd8dkFUdY1NzGtnG+Etu22V
ypPQy5prY5rs0EHichVB/ejFGW2S6l1NvuERPRsCImZC1J1S64Ni3EDdFbop2iksyP+TBjJknqwp
eaxc5775iyHFKRYtwz5qDUbqj+zmS6L1p+ZcIJHLp6Fp2EYmEicHKVnOELdIvSYoBK46RGKA6CFE
Fc6DQWBjEEZpfJWx7oV/xdyRThQkBw7oe8A=


--===============0688589830==--