From: magnus.blaudd
Date: June 22 2011 6:20am
Subject: bzr commit into mysql-5.1-telco-7.1 branch (magnus.blaudd:4254)
List-Archive: http://lists.mysql.com/commits/139634
Message-Id: <20110622062023.788BF134016@pilot>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

#At file:///home/msvensson/mysql/tmp/fCvYqAkorU/7.1/ based on revid:magnus.blaudd@stripped

 4254 magnus.blaudd@stripped	2011-06-22 [merge]
      Merge 7.0 -> 7.1

    modified:
      storage/ndb/src/common/portlib/CMakeLists.txt
=== 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: revision is a merge (you can force generation of a bundle with env var BZR_FORCE_BUNDLE=1)).