From: magnus.blaudd Date: October 3 2011 12:59pm Subject: bzr push into mysql-trunk-cluster branch (magnus.blaudd:3373 to 3380) List-Archive: http://lists.mysql.com/commits/141282 Message-Id: <201110031259.p93Cxodp027635@acsmt357.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3380 magnus.blaudd@stripped 2011-10-03 [merge] Merge 5.5-cluster(3505) -> trunk-cluster added: mysql-test/suite/ndb/t/ndb_index_stat_partitions-master.opt storage/ndb/memcache/README modified: mysql-test/suite/ndb/r/ndb_index_stat_partitions.result mysql-test/suite/rpl/t/disabled.def sql/ha_ndbcluster.cc sql/ha_ndbcluster_binlog.cc sql/ha_ndbcluster_binlog.h storage/ndb/compile-cluster storage/ndb/include/mgmcommon/ConfigRetriever.hpp storage/ndb/memcache/CMakeLists.txt storage/ndb/memcache/atomics.cmake storage/ndb/memcache/include/ndb_configuration.h storage/ndb/memcache/sandbox.sh.in storage/ndb/memcache/src/Configuration.cc storage/ndb/memcache/src/ndb_configuration.cc storage/ndb/memcache/src/ndb_engine.c storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp storage/ndb/src/mgmapi/mgmapi.cpp storage/ndb/src/mgmsrv/MgmtSrvr.cpp storage/ndb/src/ndbapi/NdbQueryOperation.cpp storage/ndb/src/ndbapi/ndb_cluster_connection.cpp storage/ndb/test/ndbapi/testMgm.cpp storage/ndb/test/ndbapi/testNdbApi.cpp 3379 magnus.blaudd@stripped 2011-10-03 [merge] Merge 5.5-cluster(3499) -> trunk-cluster removed: storage/ndb/memcache/include/ndbmemcache_config.h added: mysql-test/suite/ndb/r/ndb_index_stat_partitions.result mysql-test/suite/ndb/t/ndb_index_stat_partitions.test modified: mysql-test/suite/ndb_memcache/t/type_char.test sql/ha_ndb_index_stat.cc storage/ndb/include/ndb_types.h.in storage/ndb/memcache/CMakeLists.txt storage/ndb/memcache/atomics.cmake storage/ndb/memcache/include/ndbmemcache_config.in storage/ndb/memcache/sandbox.sh.in storage/ndb/src/dummy.cpp storage/ndb/src/kernel/blocks/LocalProxy.cpp storage/ndb/src/kernel/blocks/LocalProxy.hpp storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp storage/ndb/src/kernel/blocks/dbspj/DbspjProxy.hpp storage/ndb/src/kernel/blocks/dbtc/DbtcProxy.cpp storage/ndb/src/kernel/blocks/dbtc/DbtcProxy.hpp storage/ndb/src/kernel/blocks/dbtup/DbtupBuffer.cpp storage/ndb/src/kernel/vm/GlobalData.hpp storage/ndb/src/kernel/vm/dummy_nonmt.cpp storage/ndb/src/kernel/vm/mt.cpp storage/ndb/src/kernel/vm/mt.hpp storage/ndb/src/ndbapi/NdbIndexStatImpl.cpp storage/ndb/src/ndbapi/NdbIndexStatImpl.hpp storage/ndb/test/include/NDBT_Workingdir.hpp storage/ndb/test/include/NdbProcess.hpp storage/ndb/test/ndbapi/CMakeLists.txt 3378 magnus.blaudd@stripped 2011-10-03 [merge] Merge 5.5-cluster(3492) -> trunk-cluster modified: mysql-test/include/mtr_warnings.sql mysql-test/suite/ndb/r/ndb_auto_increment.result mysql-test/suite/ndb/r/ndb_mgm.result mysql-test/suite/ndb/t/ndb_auto_increment.test mysql-test/suite/ndb/t/ndb_mgm.test mysql-test/suite/ndb/t/ndb_share.test mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict_epoch.result mysql-test/suite/ndb_rpl/r/ndb_rpl_ui.result mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_epoch_1.inc mysql-test/suite/ndb_rpl/t/ndb_rpl_ui.test sql/abstract_query_plan.h sql/ha_ndbcluster.cc sql/ha_ndbcluster.h sql/handler.cc sql/handler.h sql/sql_select.cc storage/ndb/CMakeLists.txt storage/ndb/clusterj/clusterj-core/CMakeLists.txt storage/ndb/clusterj/clusterj-jpatest/CMakeLists.txt storage/ndb/clusterj/clusterj-test/CMakeLists.txt storage/ndb/config/type_JAVA.cmake storage/ndb/src/CMakeLists.txt storage/ndb/src/cw/cpcd/CMakeLists.txt storage/ndb/src/kernel/angel.cpp storage/ndb/src/kernel/blocks/CMakeLists.txt storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp storage/ndb/src/kernel/error/CMakeLists.txt storage/ndb/src/kernel/vm/CMakeLists.txt storage/ndb/src/kernel/vm/Configuration.cpp storage/ndb/src/mgmclient/CMakeLists.txt storage/ndb/src/mgmsrv/CMakeLists.txt storage/ndb/src/mgmsrv/MgmtSrvr.cpp storage/ndb/src/mgmsrv/MgmtSrvr.hpp storage/ndb/src/mgmsrv/Services.cpp storage/ndb/src/mgmsrv/Services.hpp 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/ndbapi/ndb_cluster_connection.cpp storage/ndb/src/ndbapi/ndberror.c storage/ndb/src/ndbjtie/jtie/jtie_tconv_idcache_impl.hpp storage/ndb/test/include/NdbMgmd.hpp storage/ndb/test/ndbapi/CMakeLists.txt storage/ndb/test/ndbapi/bank/CMakeLists.txt storage/ndb/test/ndbapi/testMgm.cpp storage/ndb/test/ndbapi/testNdbApi.cpp storage/ndb/test/ndbapi/testSpj.cpp storage/ndb/test/run-test/CMakeLists.txt storage/ndb/test/src/CMakeLists.txt storage/ndb/test/tools/CMakeLists.txt storage/ndb/test/tools/connect.cpp storage/ndb/tools/CMakeLists.txt 3377 magnus.blaudd@stripped 2011-10-03 [merge] Merge 5.5-cluster(3483) -> trunk-cluster removed: storage/ndb/src/ndbjtie/mysql/ storage/ndb/src/ndbjtie/mysql/CMakeLists.txt added: mysql-test/lib/My/Memcache.pm mysql-test/suite/ndb/t/memcache_basic.test mysql-test/suite/ndb_memcache/ mysql-test/suite/ndb_memcache/include/ mysql-test/suite/ndb_memcache/include/datatypes_tables.inc 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/my.cnf mysql-test/suite/ndb_memcache/r/ mysql-test/suite/ndb_memcache/r/basic.result mysql-test/suite/ndb_memcache/r/lib_ascii.result mysql-test/suite/ndb_memcache/r/lib_binary.result mysql-test/suite/ndb_memcache/r/math1.result mysql-test/suite/ndb_memcache/r/math2.result mysql-test/suite/ndb_memcache/r/reconf1.result mysql-test/suite/ndb_memcache/r/tsv1.result mysql-test/suite/ndb_memcache/r/tsv2.result mysql-test/suite/ndb_memcache/r/type_char.result mysql-test/suite/ndb_memcache/r/type_signed.result mysql-test/suite/ndb_memcache/r/type_unsigned.result mysql-test/suite/ndb_memcache/t/ mysql-test/suite/ndb_memcache/t/basic.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/type_char.test mysql-test/suite/ndb_memcache/t/type_signed.test mysql-test/suite/ndb_memcache/t/type_unsigned.test storage/ndb/memcache/ storage/ndb/memcache/CMakeLists.txt storage/ndb/memcache/FindMemcached.cmake storage/ndb/memcache/atomics.cmake storage/ndb/memcache/cache-src/ storage/ndb/memcache/cache-src/LICENSE storage/ndb/memcache/cache-src/assoc.c storage/ndb/memcache/cache-src/assoc.h storage/ndb/memcache/cache-src/default_engine.c storage/ndb/memcache/cache-src/default_engine.h storage/ndb/memcache/cache-src/items.c storage/ndb/memcache/cache-src/items.h storage/ndb/memcache/cache-src/slabs.c storage/ndb/memcache/cache-src/slabs.h storage/ndb/memcache/cache-src/trace.h storage/ndb/memcache/include/ storage/ndb/memcache/include/ClusterConnectionPool.h storage/ndb/memcache/include/Config_v1.h storage/ndb/memcache/include/Configuration.h storage/ndb/memcache/include/DataTypeHandler.h storage/ndb/memcache/include/KeyPrefix.h storage/ndb/memcache/include/NdbInstance.h storage/ndb/memcache/include/Operation.h storage/ndb/memcache/include/QueryPlan.h storage/ndb/memcache/include/Queue.h storage/ndb/memcache/include/Record.h storage/ndb/memcache/include/Scheduler.h storage/ndb/memcache/include/TabSeparatedValues.h storage/ndb/memcache/include/TableSpec.h storage/ndb/memcache/include/atomics.h storage/ndb/memcache/include/debug.h storage/ndb/memcache/include/hash_item_util.h storage/ndb/memcache/include/int3korr.h storage/ndb/memcache/include/ndb_configuration.h storage/ndb/memcache/include/ndb_engine.h storage/ndb/memcache/include/ndb_pipeline.h storage/ndb/memcache/include/ndb_worker.h storage/ndb/memcache/include/ndbmemcache_config.h storage/ndb/memcache/include/ndbmemcache_config.in storage/ndb/memcache/include/ndbmemcache_global.h storage/ndb/memcache/include/status_block.h storage/ndb/memcache/include/thread_identifier.h storage/ndb/memcache/include/timing.h storage/ndb/memcache/include/workitem.h storage/ndb/memcache/include/workqueue.h storage/ndb/memcache/memcached_path.pl.in storage/ndb/memcache/sandbox.sh.in storage/ndb/memcache/scripts/ storage/ndb/memcache/scripts/ndb_memcache_metadata.sql storage/ndb/memcache/scripts/pmpstack.awk storage/ndb/memcache/src/ storage/ndb/memcache/src/ClusterConnectionPool.cc storage/ndb/memcache/src/Config_v1.cc storage/ndb/memcache/src/Configuration.cc storage/ndb/memcache/src/DataTypeHandler.cc storage/ndb/memcache/src/KeyPrefix.cc storage/ndb/memcache/src/NdbInstance.cc storage/ndb/memcache/src/Operation.cc storage/ndb/memcache/src/QueryPlan.cc storage/ndb/memcache/src/Record.cc storage/ndb/memcache/src/TabSeparatedValues.cc storage/ndb/memcache/src/TableSpec.cc storage/ndb/memcache/src/atomics.c storage/ndb/memcache/src/debug.c storage/ndb/memcache/src/embedded_default_engine.c storage/ndb/memcache/src/hash_item_util.c storage/ndb/memcache/src/ndb_configuration.cc storage/ndb/memcache/src/ndb_engine.c storage/ndb/memcache/src/ndb_engine_private.h storage/ndb/memcache/src/ndb_pipeline.cc storage/ndb/memcache/src/ndb_worker.cc storage/ndb/memcache/src/schedulers/ 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/src/thread_identifier.c storage/ndb/memcache/src/timing.c storage/ndb/memcache/src/workitem.c storage/ndb/memcache/src/workqueue.c storage/ndb/memcache/unit/ storage/ndb/memcache/unit/CMakeLists.txt storage/ndb/memcache/unit/all_tests.h storage/ndb/memcache/unit/alloc.cc storage/ndb/memcache/unit/cas.cc storage/ndb/memcache/unit/casbits.cc storage/ndb/memcache/unit/connpool.cc storage/ndb/memcache/unit/harness.cc storage/ndb/memcache/unit/incr.cc storage/ndb/memcache/unit/queue.cc storage/ndb/memcache/unit/stub_logger.c storage/ndb/memcache/unit/test_workqueue.c storage/ndb/memcache/unit/tsv.cc renamed: storage/ndb/src/ndbjtie/mysql/CharsetMap.cpp => storage/ndb/src/common/util/CharsetMap.cpp storage/ndb/src/ndbjtie/mysql/CharsetMap.hpp => storage/ndb/include/util/CharsetMap.hpp storage/ndb/src/ndbjtie/mysql/CharsetMapImpl.cpp => storage/ndb/src/common/util/CharsetMapImpl.cpp storage/ndb/src/ndbjtie/mysql/CharsetMapImpl.h => storage/ndb/src/common/util/CharsetMapImpl.h storage/ndb/src/ndbjtie/mysql/decimal_utils.cpp => storage/ndb/src/common/util/decimal_utils.cpp storage/ndb/src/ndbjtie/mysql/decimal_utils.hpp => storage/ndb/include/util/decimal_utils.hpp storage/ndb/src/ndbjtie/mysql/test/ => storage/ndb/src/common/util/testMysqlUtils/ modified: mysql-test/mysql-test-run.pl storage/ndb/CMakeLists.txt storage/ndb/src/CMakeLists.txt storage/ndb/src/common/util/CMakeLists.txt storage/ndb/src/ndbjtie/CMakeLists.txt storage/ndb/src/ndbjtie/MysqlUtilsWrapper.hpp storage/ndb/src/common/util/CharsetMap.cpp storage/ndb/include/util/CharsetMap.hpp 3376 magnus.blaudd@stripped 2011-10-03 [merge] Merge 5.5-cluster(3475) -> trunk-cluster modified: storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/TimestampAsUtilDateTest.java 3375 magnus.blaudd@stripped 2011-10-03 [merge] Merge 5.5-cluster(3473) -> trunk-cluster modified: mysql-test/suite/ndb/r/ndb_join_pushdown.result mysql-test/suite/ndb/t/ndb_join_pushdown.test sql/ha_ndbcluster_push.cc sql/ha_ndbcluster_push.h storage/ndb/src/ndbapi/NdbQueryBuilder.cpp storage/ndb/src/ndbapi/NdbQueryBuilderImpl.hpp 3374 magnus.blaudd@stripped 2011-10-03 [merge] Merge 5.5-cluster(3472) -> trunk-cluster added: storage/ndb/src/ndbapi/NdbWaitGroup.cpp storage/ndb/src/ndbapi/NdbWaitGroup.hpp storage/ndb/src/ndbapi/WakeupHandler.cpp storage/ndb/src/ndbapi/WakeupHandler.hpp storage/ndb/test/ndbapi/testAsynchMultiwait.cpp modified: sql/ha_ndbcluster.cc sql/handler.cc storage/ndb/include/ndbapi/Ndb.hpp storage/ndb/include/ndbapi/ndb_cluster_connection.hpp storage/ndb/include/transporter/TransporterCallback.hpp storage/ndb/src/common/transporter/TransporterRegistry.cpp storage/ndb/src/kernel/ndbd.cpp storage/ndb/src/kernel/vm/Configuration.cpp storage/ndb/src/ndbapi/API.hpp storage/ndb/src/ndbapi/CMakeLists.txt storage/ndb/src/ndbapi/NdbImpl.hpp storage/ndb/src/ndbapi/Ndbif.cpp storage/ndb/src/ndbapi/Ndbinit.cpp storage/ndb/src/ndbapi/TransporterFacade.cpp storage/ndb/src/ndbapi/TransporterFacade.hpp storage/ndb/src/ndbapi/ndb_cluster_connection.cpp storage/ndb/src/ndbapi/ndb_cluster_connection_impl.hpp storage/ndb/src/ndbapi/trp_client.hpp storage/ndb/test/run-test/daily-basic-tests.txt 3373 magnus.blaudd@stripped 2011-10-03 [merge] Merge -r 3470 5.5-cluster->trunk-cluster modified: mysql-test/suite/ndb/r/ndb_alter_table_online2.result mysql-test/suite/ndb/t/ndb_alter_table_online2.test mysql-test/t/disabled.def sql/ha_ndbcluster.cc sql/ha_ndbcluster.h sql/handler.cc sql/handler.h sql/sql_table.cc Diff too large for email (28097 lines, the limit is 10000). No bundle (reason: useless for push emails).