From: magnus.blaudd Date: April 11 2012 12:37pm Subject: bzr push into mysql-5.5-cluster-7.3 branch (magnus.blaudd:3877 to 3878) List-Archive: http://lists.mysql.com/commits/143458 Message-Id: <201204111237.q3BCb4CP028581@acsmt357.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3878 magnus.blaudd@stripped 2012-04-11 [merge] Merge 7.2 -> 7.3 modified: storage/ndb/CMakeLists.txt storage/ndb/compile-cluster 3877 magnus.blaudd@stripped 2012-04-11 [merge] Merge 7.2 -> 7.3 removed: mysql-test/suite/ndb_rpl/t/ndb_rpl_relayrotate-slave.opt added: storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordIndexScanOperationImpl.java storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordScanOperationImpl.java storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordScanResultDataImpl.java storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordTableScanOperationImpl.java storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordUniqueKeyOperationImpl.java modified: mysql-test/suite/ndb/r/ndb_restore_misc.result mysql-test/suite/ndb/t/ndb_restore_misc.test mysql-test/suite/ndb_rpl/my.cnf mysql-test/suite/ndb_rpl/t/ndb_rpl_break_3_chain.cnf mysql-test/suite/rpl_ndb/my.cnf storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/SessionImpl.java storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/metadata/AbstractDomainTypeHandlerImpl.java storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/metadata/DomainTypeHandlerImpl.java storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/QueryDomainTypeImpl.java storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/spi/DomainTypeHandler.java storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/spi/SessionSPI.java storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/spi/SmartValueHandler.java storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/spi/ValueHandlerFactory.java storage/ndb/clusterj/clusterj-openjpa/src/main/java/com/mysql/clusterj/openjpa/NdbOpenJPADomainTypeHandlerImpl.java storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/AbstractClusterJTest.java storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/BitTypesTest.java storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/DbugTest.java storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryMultiColumnIndexInTest.java storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/SchemaChangeTest.java storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/domaintypehandler/CrazyDomainTypeHandlerFactoryImpl.java storage/ndb/clusterj/clusterj-tie/logging.properties storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/ClusterConnectionImpl.java storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/ClusterTransactionImpl.java storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/DbImpl.java storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordImpl.java storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordInsertOperationImpl.java storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordKeyOperationImpl.java storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordOperationImpl.java storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordResultDataImpl.java storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordSmartValueHandlerFactoryImpl.java storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordSmartValueHandlerImpl.java storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/ResultDataImpl.java storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/ScanResultDataImpl.java storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/Utility.java storage/ndb/compile-cluster storage/ndb/include/util/Vector.hpp storage/ndb/memcache/extra/memcached/CMakeLists.txt storage/ndb/memcache/extra/memcached/config_tests.in storage/ndb/memcache/extra/memcached/daemon/memcached.c storage/ndb/memcache/include/Scheduler.h storage/ndb/memcache/include/ndb_engine.h storage/ndb/memcache/include/ndb_engine_errors.h storage/ndb/memcache/include/ndb_pipeline.h storage/ndb/memcache/include/ndbmemcache_config.in storage/ndb/memcache/src/ExternalValue.cc storage/ndb/memcache/src/ndb_engine.c storage/ndb/memcache/src/ndb_engine_errors.cc storage/ndb/memcache/src/ndb_error_logger.cc storage/ndb/memcache/src/ndb_pipeline.cc storage/ndb/memcache/src/ndb_worker.cc storage/ndb/memcache/src/schedulers/S_sched.cc storage/ndb/memcache/src/schedulers/S_sched.h storage/ndb/memcache/src/schedulers/Stockholm.cc storage/ndb/memcache/src/schedulers/Stockholm.h storage/ndb/memcache/unit/alloc.cc storage/ndb/src/ndbapi/NdbQueryBuilder.cpp storage/ndb/src/ndbapi/NdbQueryOperation.cpp === modified file 'storage/ndb/CMakeLists.txt' --- a/storage/ndb/CMakeLists.txt 2012-02-23 15:41:31 +0000 +++ b/storage/ndb/CMakeLists.txt 2012-04-11 12:07:25 +0000 @@ -118,10 +118,11 @@ MYSQL_ADD_PLUGIN(ndbcluster ${NDBCLUSTER LINK_LIBRARIES ndbclient_static) # -# Add NDB binaries if ndbcluster is built +# Build NDB only if MYSQL_ADD_PLUGIN has decided(by looking at various +# cmake args same as all other plugins have) to build ndbcluster(our handler) # -IF (NOT DEFINED WITH_NDBCLUSTER) - # Not building NDB +IF (NOT WITH_NDBCLUSTER) + MESSAGE(STATUS "Not building NDB") RETURN() ENDIF() === modified file 'storage/ndb/compile-cluster' --- a/storage/ndb/compile-cluster 2012-04-10 11:40:39 +0000 +++ b/storage/ndb/compile-cluster 2012-04-11 12:23:22 +0000 @@ -85,7 +85,7 @@ my $cmake_version_id; my @args; # Hardcoded options controlling how to build MySQL Server - push(@args, "-DWITH_SSL=yes"); + push(@args, "-DWITH_SSL=bundled"); # Consistent error messages if ($opt_debug) { No bundle (reason: useless for push emails).