From: magnus.blaudd Date: June 21 2011 2:37pm Subject: bzr push into mysql-5.1-telco-7.1 branch (magnus.blaudd:4251 to 4252) List-Archive: http://lists.mysql.com/commits/139592 Message-Id: <20110621143734.50791134016@pilot> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 4252 magnus.blaudd@stripped 2011-06-21 [merge] Merge modified: storage/ndb/CMakeLists.txt storage/ndb/clusterj/CMakeLists.txt storage/ndb/src/CMakeLists.txt 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/kernel/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 storage/ndb/src/ndbjtie/mysql/CMakeLists.txt storage/ndb/test/ndbapi/testBasic.cpp 4251 magnus.blaudd@stripped 2011-06-21 [merge] Merge 7.0 -> 7.1 added: mysql-test/suite/ndb/r/ndb_select_count.result mysql-test/suite/ndb/t/ndb_select_count.test modified: sql/ha_ndbcluster.cc storage/ndb/include/mgmapi/mgmapi.h storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp storage/ndb/src/mgmapi/mgmapi.cpp storage/ndb/src/mgmsrv/MgmtSrvr.cpp storage/ndb/src/mgmsrv/MgmtSrvr.hpp storage/ndb/src/ndbapi/ClusterMgr.cpp storage/ndb/src/ndbapi/NdbQueryBuilder.hpp storage/ndb/src/ndbapi/NdbQueryOperation.cpp storage/ndb/src/ndbapi/NdbQueryOperation.hpp storage/ndb/src/ndbapi/NdbQueryOperationImpl.hpp storage/ndb/test/ndbapi/testMgmd.cpp === modified file 'storage/ndb/CMakeLists.txt' --- a/storage/ndb/CMakeLists.txt 2011-06-17 07:14:20 +0000 +++ b/storage/ndb/CMakeLists.txt 2011-06-21 14:12:56 +0000 @@ -159,7 +159,9 @@ ELSE() IF(WITH_NDB_TEST) ADD_SUBDIRECTORY(src/cw/cpcd) ENDIF() - ADD_SUBDIRECTORY(clusterj) + IF (HAVE_JDK) + ADD_SUBDIRECTORY(clusterj) + ENDIF() ENDIF() === modified file 'storage/ndb/clusterj/CMakeLists.txt' --- a/storage/ndb/clusterj/CMakeLists.txt 2011-04-06 16:02:16 +0000 +++ b/storage/ndb/clusterj/CMakeLists.txt 2011-06-16 09:33:27 +0000 @@ -13,10 +13,6 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -IF(!HAVE_JDK) - RETURN() -ENDIF() - MESSAGE(STATUS "including ClusterJ") IF("${WITH_CLASSPATH}" MATCHES "junit-(.+).jar") === modified file 'storage/ndb/src/CMakeLists.txt' --- a/storage/ndb/src/CMakeLists.txt 2011-02-02 09:20:32 +0000 +++ b/storage/ndb/src/CMakeLists.txt 2011-06-21 14:09:17 +0000 @@ -21,7 +21,6 @@ ADD_SUBDIRECTORY(ndbapi) ADD_SUBDIRECTORY(kernel) ADD_SUBDIRECTORY(mgmclient) ADD_SUBDIRECTORY(mgmsrv) -ADD_SUBDIRECTORY(ndbjtie) INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/storage/ndb/include ${CMAKE_SOURCE_DIR}/include) @@ -33,7 +32,7 @@ SET(NDBCLIENT_LIBS ndbtrace ndbsignaldata ndbmgmapi - ndbmgmsrv + ndbmgmcommon ndblogger ndbportlib ndbgeneral @@ -41,6 +40,8 @@ SET(NDBCLIENT_LIBS IF(HAVE_JDK AND HAVE_JAVA) + ADD_SUBDIRECTORY(ndbjtie) + SET(NDBCLIENT_LIBS ${NDBCLIENT_LIBS} mysqlutils ndbjtie) INCLUDE_DIRECTORIES(${JNI_INCLUDE_DIRS}) === 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 14:05:31 +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 @@ -26,4 +26,4 @@ ADD_LIBRARY(ndbtrace STATIC ${NDB_SOURCE_DIR}/src/kernel/error/ndbd_exit_codes.c ) -TARGET_LINK_LIBRARIES(ndbtrace ndblogger ndbgeneral) +TARGET_LINK_LIBRARIES(ndbtrace ndbsignaldata ndblogger ndbgeneral) === 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 14:07:12 +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 - ConfigRetriever.cpp - IPCConfig.cpp) +ADD_CONVENIENCE_LIBRARY(ndbmgmcommon + 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/kernel/CMakeLists.txt' --- a/storage/ndb/src/kernel/CMakeLists.txt 2011-02-23 22:59:16 +0000 +++ b/storage/ndb/src/kernel/CMakeLists.txt 2011-06-21 14:09:17 +0000 @@ -42,7 +42,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOUR ) SET(NDBD_LIBS ndbblocks ndbkernel ndberror ndbtransport - ndbtrace ndbsignaldata ndblogger ndbmgmsrv ndbmgmapi + ndbtrace ndbsignaldata ndblogger ndbmgmcommon ndbmgmapi ndbportlib ndbgeneral dbug mysys strings ) === 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-21 13:50:33 +0000 +++ b/storage/ndb/src/mgmsrv/MgmtSrvr.cpp 2011-06-21 14:12:56 +0000 @@ -42,7 +42,6 @@ #include #include #include -#include #include #include #include @@ -1461,11 +1460,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-14 10:42:04 +0000 +++ b/storage/ndb/src/ndbapi/CMakeLists.txt 2011-06-21 14:12:56 +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 === modified file 'storage/ndb/src/ndbjtie/mysql/CMakeLists.txt' --- a/storage/ndb/src/ndbjtie/mysql/CMakeLists.txt 2011-01-31 09:07:01 +0000 +++ b/storage/ndb/src/ndbjtie/mysql/CMakeLists.txt 2011-06-21 14:04:38 +0000 @@ -19,5 +19,8 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/ ${CMAKE_SOURCE_DIR}/storage/ndb/include/util ${CMAKE_SOURCE_DIR}/storage/ndb/include/portlib ) -ADD_LIBRARY(mysqlutils decimal_utils.cpp CharsetMap.cpp CharsetMapImpl.cpp) +ADD_CONVENIENCE_LIBRARY(mysqlutils + decimal_utils.cpp + CharsetMap.cpp + CharsetMapImpl.cpp) === modified file 'storage/ndb/test/ndbapi/testBasic.cpp' --- a/storage/ndb/test/ndbapi/testBasic.cpp 2011-05-25 13:19:02 +0000 +++ b/storage/ndb/test/ndbapi/testBasic.cpp 2011-06-20 07:17:57 +0000 @@ -3027,14 +3027,14 @@ static RefreshScenario refreshTests[] = enum OpTypes { - READ_C, - READ_S, - READ_E, - INSERT, - UPDATE, - WRITE, - DELETE, - LAST + OP_READ_C, + OP_READ_S, + OP_READ_E, + OP_INSERT, + OP_UPDATE, + OP_WRITE, + OP_DELETE, + OP_LAST }; const char* opTypeNames[] = @@ -3133,9 +3133,9 @@ runRefreshLocking(NDBT_Context* ctx, NDB { /* Now try ops from another transaction */ HugoOperations hugoOps(*ctx->getTab()); - Uint32 ot = READ_C; + Uint32 ot = OP_READ_C; - while (ot < LAST) + while (ot < OP_LAST) { if (hugoOps.startTransaction(ndb) != 0) { @@ -3147,34 +3147,34 @@ runRefreshLocking(NDBT_Context* ctx, NDB int res = 0; switch (ot) { - case READ_C: + case OP_READ_C: res = hugoOps.pkReadRecord(ndb,0,1,NdbOperation::LM_CommittedRead); break; - case READ_S: + case OP_READ_S: res = hugoOps.pkReadRecord(ndb,0,1,NdbOperation::LM_Read); break; - case READ_E: + case OP_READ_E: res = hugoOps.pkReadRecord(ndb,0,1,NdbOperation::LM_Exclusive); break; - case INSERT: + case OP_INSERT: res = hugoOps.pkInsertRecord(ndb, 0); break; - case UPDATE: + case OP_UPDATE: res = hugoOps.pkUpdateRecord(ndb, 0); break; - case WRITE: + case OP_WRITE: res = hugoOps.pkWriteRecord(ndb, 0); break; - case DELETE: + case OP_DELETE: res = hugoOps.pkDeleteRecord(ndb, 0); break; - case LAST: + case OP_LAST: abort(); } hugoOps.execute_Commit(ndb); - if ((ot == READ_C) && (scenario.preExist)) + if ((ot == OP_READ_C) && (scenario.preExist)) { if (hugoOps.getNdbError().code == 0) { No bundle (reason: useless for push emails).