bzr push into mysql-5.1-telco-7.0 branch (magnus.blaudd:4471 to 4472)

[magnus.blaudd]

 4472 magnus.blaudd@stripped	2011-06-22
      ndb
       - use ADD_CONVENIENCE_LIBRARY when bulding libraies which should be
         merged into libndbclient(also libportlib)

    modified:
      storage/ndb/src/common/portlib/CMakeLists.txt
 4471 magnus.blaudd@stripped	2011-06-21
      ndb
       - fix suppression in ctype_cp932_binlog_stm.test which is
         date dependent(causes the binlog positions to change). Since it's
         midsummer today, the binlog size/position has grown with one. Enjoy!

    modified:
      mysql-test/t/ctype_cp932_binlog_stm.test
=== modified file 'storage/ndb/src/common/portlib/CMakeLists.txt'
--- a/storage/ndb/src/common/portlib/CMakeLists.txt	2011-05-25 06:52:33 +0000
+++ b/storage/ndb/src/common/portlib/CMakeLists.txt	2011-06-22 06:19:13 +0000
@@ -22,7 +22,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/
 IF(WIN32)
   SET(EXTRA_SRC ${CMAKE_SOURCE_DIR}/sql/nt_servc.cc)
 ENDIF(WIN32)
-ADD_LIBRARY(ndbportlib STATIC
+ADD_CONVENIENCE_LIBRARY(ndbportlib
             NdbCondition.c NdbMutex.c ndb_socket.cpp
             NdbEnv.c NdbThread.c NdbHost.c NdbTCP.cpp
             NdbMem.c NdbConfig.c NdbTick.c NdbDir.cpp

No bundle (reason: useless for push emails).