From: magnus.blaudd
Date: June 21 2011 1:58pm
Subject: bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:4459)
List-Archive: http://lists.mysql.com/commits/139572
Message-Id: <20110621135807.E19BA134016@pilot>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7700627894112237034=="

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

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

 4459 magnus.blaudd@stripped	2011-06-21
      ndb
       - use ADD_CONVENIENCE_LIBRARY when bulding libraies which should be
         merged into libndbclient

    modified:
      storage/ndb/src/common/debugger/CMakeLists.txt
      storage/ndb/src/common/debugger/signaldata/CMakeLists.txt
      storage/ndb/src/common/logger/CMakeLists.txt
      storage/ndb/src/common/mgmcommon/CMakeLists.txt
      storage/ndb/src/common/transporter/CMakeLists.txt
      storage/ndb/src/common/util/CMakeLists.txt
      storage/ndb/src/mgmapi/CMakeLists.txt
      storage/ndb/src/mgmsrv/CMakeLists.txt
      storage/ndb/src/ndbapi/CMakeLists.txt
=== modified file 'storage/ndb/src/common/debugger/CMakeLists.txt'
--- a/storage/ndb/src/common/debugger/CMakeLists.txt	2011-02-02 00:40:07 +0000
+++ b/storage/ndb/src/common/debugger/CMakeLists.txt	2011-06-21 13:58:00 +0000
@@ -18,7 +18,7 @@ ADD_SUBDIRECTORY(signaldata)
 
 INCLUDE(${CMAKE_SOURCE_DIR}/storage/ndb/config/type_kernel.cmake)
 
-ADD_LIBRARY(ndbtrace STATIC
+ADD_CONVENIENCE_LIBRARY(ndbtrace
             SignalLoggerManager.cpp
             DebuggerNames.cpp
             BlockNames.cpp

=== modified file 'storage/ndb/src/common/debugger/signaldata/CMakeLists.txt'
--- a/storage/ndb/src/common/debugger/signaldata/CMakeLists.txt	2011-05-23 15:46:53 +0000
+++ b/storage/ndb/src/common/debugger/signaldata/CMakeLists.txt	2011-06-21 13:58:00 +0000
@@ -13,7 +13,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-ADD_LIBRARY(ndbsignaldata STATIC
+ADD_CONVENIENCE_LIBRARY(ndbsignaldata
         AlterIndxImpl.cpp BuildIndxImpl.cpp BuildIndx.cpp
         CreateIndxImpl.cpp CreateTab.cpp
         CreateTable.cpp CreateTrigImpl.cpp #DihSwitchReplicaReq.cpp

=== modified file 'storage/ndb/src/common/logger/CMakeLists.txt'
--- a/storage/ndb/src/common/logger/CMakeLists.txt	2011-02-02 00:40:07 +0000
+++ b/storage/ndb/src/common/logger/CMakeLists.txt	2011-06-21 13:58:00 +0000
@@ -13,7 +13,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-ADD_LIBRARY(ndblogger STATIC
+ADD_CONVENIENCE_LIBRARY(ndblogger
             Logger.cpp
             LogHandlerList.cpp
             LogHandler.cpp

=== modified file 'storage/ndb/src/common/mgmcommon/CMakeLists.txt'
--- a/storage/ndb/src/common/mgmcommon/CMakeLists.txt	2011-02-02 00:40:07 +0000
+++ b/storage/ndb/src/common/mgmcommon/CMakeLists.txt	2011-06-21 13:58:00 +0000
@@ -18,7 +18,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/
                     ${CMAKE_SOURCE_DIR}/storage/ndb/src/mgmsrv)
 INCLUDE(${CMAKE_SOURCE_DIR}/storage/ndb/config/type_mgmapiclient.cmake)
 
-ADD_LIBRARY(ndbmgmsrv STATIC
+ADD_CONVENIENCE_LIBRARY(ndbmgmsrv
             ConfigRetriever.cpp
             IPCConfig.cpp)
 

=== modified file 'storage/ndb/src/common/transporter/CMakeLists.txt'
--- a/storage/ndb/src/common/transporter/CMakeLists.txt	2011-02-02 00:40:07 +0000
+++ b/storage/ndb/src/common/transporter/CMakeLists.txt	2011-06-21 13:58:00 +0000
@@ -22,7 +22,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/
                     ${CMAKE_SOURCE_DIR}/storage/ndb/include/transporter
                     ${NDB_SCI_INCLUDES})
 
-ADD_LIBRARY(ndbtransport STATIC
+ADD_CONVENIENCE_LIBRARY(ndbtransport
             Transporter.cpp TCP_Transporter.cpp Loopback_Transporter.cpp
             TransporterRegistry.cpp Packer.cpp)
 

=== modified file 'storage/ndb/src/common/util/CMakeLists.txt'
--- a/storage/ndb/src/common/util/CMakeLists.txt	2011-05-09 15:35:25 +0000
+++ b/storage/ndb/src/common/util/CMakeLists.txt	2011-06-21 13:58:00 +0000
@@ -25,7 +25,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOUR
                     ${CMAKE_SOURCE_DIR}/storage/ndb/include/logger)
 
 ADD_DEFINITIONS(-DNO_DUMMY_DECL)
-ADD_LIBRARY(ndbgeneral STATIC
+ADD_CONVENIENCE_LIBRARY(ndbgeneral
             ndbzio.c
             File.cpp
             md5_hash.cpp

=== modified file 'storage/ndb/src/mgmapi/CMakeLists.txt'
--- a/storage/ndb/src/mgmapi/CMakeLists.txt	2011-02-02 00:40:07 +0000
+++ b/storage/ndb/src/mgmapi/CMakeLists.txt	2011-06-21 13:58:00 +0000
@@ -20,7 +20,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/
                     ${CMAKE_SOURCE_DIR}/storage/ndb/mgmsrv
 )
 ADD_DEFINITIONS(-DNDB_MGMAPI)
-ADD_LIBRARY(ndbmgmapi STATIC
+ADD_CONVENIENCE_LIBRARY(ndbmgmapi
             mgmapi.cpp
             mgmapi_error.c
             ndb_logevent.cpp

=== modified file 'storage/ndb/src/mgmsrv/CMakeLists.txt'
--- a/storage/ndb/src/mgmsrv/CMakeLists.txt	2011-02-03 14:20:36 +0000
+++ b/storage/ndb/src/mgmsrv/CMakeLists.txt	2011-06-21 13:58:00 +0000
@@ -18,7 +18,7 @@ INCLUDE_DIRECTORIES(
   ${NDB_SOURCE_DIR}/src/ndbapi
   ${NDB_SOURCE_DIR}/src/mgmclient)
 
-ADD_LIBRARY(ndbconf
+ADD_CONVENIENCE_LIBRARY(ndbconf
                Config.cpp
                ConfigInfo.cpp
                InitConfigFileParser.cpp

=== modified file 'storage/ndb/src/ndbapi/CMakeLists.txt'
--- a/storage/ndb/src/ndbapi/CMakeLists.txt	2011-06-06 12:18:27 +0000
+++ b/storage/ndb/src/ndbapi/CMakeLists.txt	2011-06-21 13:58:00 +0000
@@ -17,7 +17,7 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${NDB_SOURCE_DIR}/src/mgmapi)
 
-ADD_LIBRARY(ndbapi STATIC
+ADD_CONVENIENCE_LIBRARY(ndbapi
             NdbEventOperation.cpp
             NdbEventOperationImpl.cpp
             NdbIndexStat.cpp


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: magnus.blaudd@stripped\
#   trgi11011453svb6
# target_branch: file:///home/msvensson/mysql/7.0/
# testament_sha1: 8381157ddd73c447b7aef4c783b2daf4fbcf27b7
# timestamp: 2011-06-21 15:58:07 +0200
# source_branch: file:///home/msvensson/mysql/7.0-dusky/
# base_revision_id: magnus.blaudd@stripped\
#   esiov1p02v1uvhgo
# 
# Begin bundle
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
OFCQmAoGbw==


--===============7700627894112237034==--