From: magnus.blaudd Date: June 21 2011 2:02pm Subject: bzr commit into mysql-5.1-telco-7.1 branch (magnus.blaudd:4245) List-Archive: http://lists.mysql.com/commits/139574 Message-Id: <20110621140202.0F498134016@pilot> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit #At file:///home/msvensson/mysql/7.1/ based on revid:magnus.blaudd@stripped 4245 magnus.blaudd@stripped 2011-06-21 [merge] Merge 7.0 -> 7.1 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/transporter/TransporterRegistry.cpp storage/ndb/src/common/util/CMakeLists.txt storage/ndb/src/mgmapi/CMakeLists.txt storage/ndb/src/mgmsrv/CMakeLists.txt storage/ndb/src/mgmsrv/MgmtSrvr.cpp 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/transporter/TransporterRegistry.cpp' --- a/storage/ndb/src/common/transporter/TransporterRegistry.cpp 2011-06-01 07:40:49 +0000 +++ b/storage/ndb/src/common/transporter/TransporterRegistry.cpp 2011-06-15 13:24:40 +0000 @@ -1002,7 +1002,7 @@ TransporterRegistry::pollReceive(Uint32 { for (int i = 0; i < num_socket_events; i++) { - Uint32 trpid = m_epoll_events[i].data.u32; + const Uint32 trpid = m_epoll_events[i].data.u32; #ifdef ERROR_INSERT if (m_blocked.get(trpid)) { @@ -1011,7 +1011,7 @@ TransporterRegistry::pollReceive(Uint32 continue; } #endif - mask.set(m_epoll_events[i].data.u32); + mask.set(trpid); } } else if (num_socket_events < 0) === 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:45:49 +0000 +++ b/storage/ndb/src/mgmsrv/CMakeLists.txt 2011-06-21 14:01:55 +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/mgmsrv/MgmtSrvr.cpp' --- a/storage/ndb/src/mgmsrv/MgmtSrvr.cpp 2011-06-01 07:51:41 +0000 +++ b/storage/ndb/src/mgmsrv/MgmtSrvr.cpp 2011-06-21 14:01:55 +0000 @@ -1486,11 +1486,11 @@ int MgmtSrvr::shutdownMGM(int *stopCount error= sendStopMgmd(nodeId, abort, true, false, false, false); if (error == 0) - *stopCount++; + (*stopCount)++; } *stopSelf= 1; - *stopCount++; + (*stopCount)++; return 0; } === 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 No bundle (reason: revision is a merge (you can force generation of a bundle with env var BZR_FORCE_BUNDLE=1)).