From: magnus.blaudd Date: May 2 2012 7:11pm Subject: bzr push into mysql-trunk-cluster branch (magnus.blaudd:3486 to 3487) List-Archive: http://lists.mysql.com/commits/143710 Message-Id: <201205021911.q42JBRxJ001280@acsmt357.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3487 magnus.blaudd@stripped 2012-05-02 [merge] Merge 7.3 -> trunk-cluster added: mysql-test/suite/ndb_binlog/r/ndb_binlog_index.result mysql-test/suite/ndb_binlog/t/ndb_binlog_check_binlog_index.inc mysql-test/suite/ndb_binlog/t/ndb_binlog_index.test mysql-test/suite/ndb_binlog/t/ndb_binlog_index_test_schema_independent.inc mysql-test/suite/ndb_memcache/r/math3.result mysql-test/suite/ndb_memcache/t/math3.test mysql-test/suite/sys_vars/r/transaction_allow_batching_basic.result mysql-test/suite/sys_vars/t/transaction_allow_batching_basic.test 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 storage/ndb/clusterj/clusterj-unit/ storage/ndb/clusterj/clusterj-unit/pom.xml storage/ndb/clusterj/clusterj-unit/src/ storage/ndb/clusterj/clusterj-unit/src/main/ storage/ndb/clusterj/clusterj-unit/src/main/java/ storage/ndb/clusterj/clusterj-unit/src/main/java/junit/ storage/ndb/clusterj/clusterj-unit/src/main/java/junit/framework/ storage/ndb/clusterj/clusterj-unit/src/main/java/junit/framework/AssertionFailedError.java storage/ndb/clusterj/clusterj-unit/src/main/java/junit/framework/Test.java storage/ndb/clusterj/clusterj-unit/src/main/java/junit/framework/TestCase.java storage/ndb/clusterj/clusterj-unit/src/main/java/junit/framework/TestListener.java storage/ndb/clusterj/clusterj-unit/src/main/java/junit/framework/TestResult.java storage/ndb/clusterj/clusterj-unit/src/main/java/junit/framework/TestSuite.java storage/ndb/clusterj/clusterj-unit/src/main/java/junit/textui/ storage/ndb/clusterj/clusterj-unit/src/main/java/junit/textui/TestRunner.java storage/ndb/clusterj/clusterj-unit/src/main/java/org/ storage/ndb/clusterj/clusterj-unit/src/main/java/org/junit/ storage/ndb/clusterj/clusterj-unit/src/main/java/org/junit/Ignore.java storage/ndb/memcache/unit/sequence.pl storage/ndb/src/kernel/vm/mt-lock.hpp storage/ndb/src/kernel/vm/mt-send-t.cpp storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NDBAPIConst.java storage/ndb/src/ndbjtie/test/ndbjtie_unit_tests_consts.cpp storage/ndb/src/ndbjtie/test/ndbjtie_unit_tests_consts.hpp storage/ndb/src/ndbjtie/test/ndbjtie_unit_tests_lib.cpp storage/ndb/src/ndbjtie/test/test/NdbJTieConstantsTest.java storage/ndb/src/ndbjtie/test/test_ndbjtie_constants.cmd.in storage/ndb/src/ndbjtie/test/test_ndbjtie_constants.sh.in storage/ndb/src/ndbjtie/test/test_unload_ndbjtie_constants.cmd.in storage/ndb/src/ndbjtie/test/test_unload_ndbjtie_constants.sh.in renamed: mysql-test/suite/ndb_rpl/t/ndb_rpl_relayrotate-slave.opt => mysql-test/suite/ndb_rpl/t/ndb_rpl_relayrotate-slave.opt.THIS modified: .bzrignore VERSION man/CMakeLists.txt mysql-test/include/wait_for_ndb_to_binlog.inc mysql-test/lib/My/ConfigFactory.pm mysql-test/lib/My/Memcache.pm mysql-test/lib/mtr_cases.pm mysql-test/mysql-test-run.pl mysql-test/suite/funcs_1/r/is_columns_mysql.result mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result mysql-test/suite/ndb/include/ndb_share_check_shares.inc mysql-test/suite/ndb/r/ndb_add_partition.result mysql-test/suite/ndb/r/ndb_alter_table_online.result mysql-test/suite/ndb/r/ndb_basic.result mysql-test/suite/ndb/r/ndb_dbug_tc_select.result mysql-test/suite/ndb/r/ndb_ddl_open_trans.result mysql-test/suite/ndb/r/ndb_global_schema_lock.result mysql-test/suite/ndb/r/ndb_index_stat_restart.result mysql-test/suite/ndb/r/ndb_join_pushdown_default.result mysql-test/suite/ndb/r/ndb_join_pushdown_nobnl.result mysql-test/suite/ndb/r/ndb_join_pushdown_none.result mysql-test/suite/ndb/r/ndb_share.result mysql-test/suite/ndb/r/ndb_statistics0.result mysql-test/suite/ndb/r/ndb_statistics1.result mysql-test/suite/ndb/t/disabled.def mysql-test/suite/ndb/t/ndb_add_partition.test mysql-test/suite/ndb/t/ndb_addnode.test mysql-test/suite/ndb/t/ndb_alter_table_online.test mysql-test/suite/ndb/t/ndb_basic.test mysql-test/suite/ndb/t/ndb_ddl_open_trans.test mysql-test/suite/ndb/t/ndb_index_stat_restart.test mysql-test/suite/ndb/t/ndb_join_pushdown.inc mysql-test/suite/ndb_binlog/r/ndb_binlog_ignore_db.result mysql-test/suite/ndb_binlog/t/ndb_binlog_ignore_db.test mysql-test/suite/ndb_memcache/include/have_memcache.inc mysql-test/suite/ndb_memcache/include/memcached_wait_for_ready.inc mysql-test/suite/ndb_memcache/include/wait_for_reconf.inc mysql-test/suite/ndb_memcache/my.cnf mysql-test/suite/ndb_memcache/t/basic.test mysql-test/suite/ndb_memcache/t/external_values.test mysql-test/suite/ndb_memcache/t/lib_ascii.test mysql-test/suite/ndb_memcache/t/lib_binary.test mysql-test/suite/ndb_memcache/t/math1.test mysql-test/suite/ndb_memcache/t/math2.test mysql-test/suite/ndb_memcache/t/reconf1.test mysql-test/suite/ndb_memcache/t/tsv1.test mysql-test/suite/ndb_memcache/t/tsv2.test mysql-test/suite/ndb_memcache/t/ttls_flags.test mysql-test/suite/ndb_memcache/t/type_char.test mysql-test/suite/ndb_memcache/t/type_numeric.test mysql-test/suite/ndb_memcache/t/type_signed.test mysql-test/suite/ndb_memcache/t/type_unsigned.test mysql-test/suite/ndb_memcache/t/unique_idx.test mysql-test/suite/ndb_rpl/r/ndb_rpl_ddl_open_trans.result mysql-test/suite/ndb_rpl/r/ndb_rpl_idempotent.result mysql-test/suite/ndb_rpl/r/ndb_rpl_sync.result mysql-test/suite/ndb_rpl/t/ndb_rpl_idempotent.test packaging/WiX/CPackWixConfig.cmake packaging/WiX/create_msi.cmake.in packaging/WiX/mysql_server.wxs.in scripts/mysql_system_tables.sql scripts/mysql_system_tables_fix.sql sql/abstract_query_plan.cc sql/ha_ndbcluster.cc sql/ha_ndbcluster.h sql/ha_ndbcluster_binlog.cc sql/ha_ndbcluster_push.cc sql/sql_select.cc sql/sys_vars.cc storage/ndb/CMakeLists.txt storage/ndb/VERSION storage/ndb/clusterj/clusterj-api/pom.xml storage/ndb/clusterj/clusterj-bindings/pom.xml storage/ndb/clusterj/clusterj-core/pom.xml 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-jdbc/pom.xml storage/ndb/clusterj/clusterj-jpatest/pom.xml storage/ndb/clusterj/clusterj-openjpa/pom.xml storage/ndb/clusterj/clusterj-openjpa/src/main/java/com/mysql/clusterj/openjpa/NdbOpenJPADomainTypeHandlerImpl.java storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/OneToManyRelationshipTest.java storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/TestBadPersistenceUnitNoConnectString.java storage/ndb/clusterj/clusterj-test/pom.xml storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/AbstractClusterJTest.java storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/AbstractQueryTest.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/DeleteAllByClassTest.java storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/ObjectNotFoundTest.java storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryExplainTest.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/VarcharStringLengthTest.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/pom.xml 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/OperationImpl.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/clusterj/clusterj-tie/src/main/resources/com/mysql/clusterj/tie/Bundle.properties storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/ConnectionPoolTest.java storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/StressTest.java storage/ndb/clusterj/pom.xml storage/ndb/compile-cluster storage/ndb/include/kernel/signaldata/ApiVersion.hpp storage/ndb/include/kernel/signaldata/DihScanTab.hpp storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp storage/ndb/include/kernel/signaldata/FireTrigOrd.hpp storage/ndb/include/kernel/signaldata/LqhKey.hpp storage/ndb/include/kernel/trigger_definitions.h storage/ndb/include/ndb_version.h.in storage/ndb/include/util/InputStream.hpp 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/NdbInstance.h storage/ndb/memcache/include/QueryPlan.h storage/ndb/memcache/include/Queue.h 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/scripts/pmpstack.awk storage/ndb/memcache/src/ExternalValue.cc storage/ndb/memcache/src/NdbInstance.cc storage/ndb/memcache/src/Record.cc storage/ndb/memcache/src/ndb_configuration.cc storage/ndb/memcache/src/ndb_engine.c storage/ndb/memcache/src/ndb_engine_errors.cc storage/ndb/memcache/src/ndb_engine_private.h 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/common/debugger/signaldata/ApiVersion.cpp storage/ndb/src/common/transporter/Transporter.cpp storage/ndb/src/common/util/version.cpp storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp storage/ndb/src/kernel/blocks/dbspj/Dbspj.hpp storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp storage/ndb/src/kernel/vm/ArrayPool.hpp storage/ndb/src/kernel/vm/CMakeLists.txt storage/ndb/src/kernel/vm/mt.cpp storage/ndb/src/mgmsrv/ConfigInfo.cpp storage/ndb/src/mgmsrv/ConfigManager.cpp storage/ndb/src/mgmsrv/MgmtSrvr.cpp storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp storage/ndb/src/ndbapi/NdbQueryBuilder.cpp storage/ndb/src/ndbapi/NdbQueryBuilder.hpp storage/ndb/src/ndbapi/NdbQueryBuilderImpl.hpp storage/ndb/src/ndbapi/NdbQueryOperation.cpp storage/ndb/src/ndbapi/NdbQueryOperationImpl.hpp storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NDBAPI.java storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbIndexScanOperation.java storage/ndb/src/ndbjtie/jtie/test/unload/test/MyLoadUnloadTest.java storage/ndb/src/ndbjtie/ndbapi_jtie.hpp storage/ndb/src/ndbjtie/test/CMakeLists.txt storage/ndb/src/ndbjtie/test/ndbjtie_unit_tests-t.alt storage/ndb/src/ndbjtie/test/ndbjtie_unit_tests-t.cpp storage/ndb/src/ndbjtie/test/test/JTieTestBase.java storage/ndb/src/ndbjtie/test/test/NdbJTieMultiLibTest.java storage/ndb/src/ndbjtie/test/test_ndbjtie_multilib.cmd.in storage/ndb/src/ndbjtie/test/test_ndbjtie_multilib.sh.in storage/ndb/src/ndbjtie/test/test_unload_ndbjtie_multilib.cmd.in storage/ndb/src/ndbjtie/test/test_unload_ndbjtie_multilib.sh.in storage/ndb/test/CMakeLists.txt storage/ndb/test/ndbapi/testIndex.cpp storage/ndb/test/ndbapi/testMgmd.cpp storage/ndb/test/ndbapi/testScan.cpp storage/ndb/test/ndbapi/testSpj.cpp storage/ndb/test/run-test/conf-blade08.cnf storage/ndb/test/run-test/conf-ndb07.cnf storage/ndb/test/run-test/conf-tyr13.cnf storage/ndb/test/run-test/daily-basic-tests.txt storage/ndb/tools/ndb_size.pl support-files/compiler_warnings.supp support-files/mysql.spec.sh 3486 magnus.blaudd@stripped 2012-04-27 [merge] Merge trunk-cluster -> trunk-cluster-stage modified: mysql-test/suite/ndb/r/ndb_join_pushdown_default.result mysql-test/suite/ndb/r/ndb_join_pushdown_nobnl.result mysql-test/suite/ndb/r/ndb_wl946_main.result mysql-test/suite/ndb/t/ndb_join_pushdown.inc mysql-test/suite/ndb/t/ndb_wl946_select_all.inc sql/opt_explain_json.cc storage/ndb/compile-cluster Diff too large for email (18301 lines, the limit is 10000). No bundle (reason: useless for push emails).