bzr commit into mysql-5.1-telco-7.0-wl4163 branch (pekka:4370) WL#4163

[Pekka Nousiainen]

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

 4370 Pekka Nousiainen	2011-05-09
      wl#4163 i04_fix.diff
      size_t warning on windows + NdbPack-t link libs

    modified:
      storage/ndb/src/common/util/CMakeLists.txt
      storage/ndb/src/common/util/NdbPack.cpp
=== modified file 'storage/ndb/src/common/util/CMakeLists.txt'
--- a/storage/ndb/src/common/util/CMakeLists.txt	2011-05-04 09:44:18 +0000
+++ b/storage/ndb/src/common/util/CMakeLists.txt	2011-05-09 15:35:25 +0000
@@ -86,5 +86,5 @@ TARGET_LINK_LIBRARIES(ndb_version-t ndbg
 ADD_EXECUTABLE(NdbPack-t NdbPack.cpp)
 SET_TARGET_PROPERTIES(NdbPack-t
                       PROPERTIES COMPILE_FLAGS "-DTEST_NDB_PACK")
-TARGET_LINK_LIBRARIES(NdbPack-t ndbgeneral)
+TARGET_LINK_LIBRARIES(NdbPack-t ndbgeneral ndbportlib)
 

=== modified file 'storage/ndb/src/common/util/NdbPack.cpp'
--- a/storage/ndb/src/common/util/NdbPack.cpp	2011-05-09 09:02:39 +0000
+++ b/storage/ndb/src/common/util/NdbPack.cpp	2011-05-09 15:35:25 +0000
@@ -684,8 +684,8 @@ NdbPack::Print::print(const char* fmt, .
   va_start(ap, fmt);
   if (m_bufsz > m_sz)
   {
-    vsnprintf(&m_buf[m_sz], m_bufsz - m_sz, fmt, ap);
-    m_sz += strlen(&m_buf[m_sz]);
+    BaseString::vsnprintf(&m_buf[m_sz], m_bufsz - m_sz, fmt, ap);
+    m_sz += (Uint32)strlen(&m_buf[m_sz]);
   }
   va_end(ap);
 }


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