From: John David Duncan Date: August 15 2011 6:47pm Subject: bzr push into mysql-5.5-cluster branch (john.duncan:3436 to 3442) List-Archive: http://lists.mysql.com/commits/140625 Message-Id: <201108151848.p7FIm3or008418@acsmt357.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3442 John David Duncan 2011-08-15 [merge] Merge from local working branch: mysql-test-run integration, ndb_memcache test suite, online reconfiguration, CHAR support, 14KB rows. 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/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/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 storage/ndb/memcache/include/Config_v1.h storage/ndb/memcache/memcached_path.pl.in storage/ndb/memcache/sandbox.sh.in storage/ndb/memcache/src/Config_v1.cc renamed: storage/ndb/src/memcache/ => storage/ndb/memcache/ modified: .bzrignore mysql-test/mysql-test-run.pl storage/ndb/CMakeLists.txt storage/ndb/config/type_JAVA.cmake storage/ndb/memcache/CMakeLists.txt storage/ndb/memcache/include/ClusterConnectionPool.h storage/ndb/memcache/include/Configuration.h 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/atomics.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/scripts/ndb_memcache_metadata.sql storage/ndb/memcache/src/ClusterConnectionPool.cc storage/ndb/memcache/src/Configuration.cc storage/ndb/memcache/src/DataTypeHandler.cc storage/ndb/memcache/src/Operation.cc storage/ndb/memcache/src/QueryPlan.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_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/src/workitem.c storage/ndb/src/CMakeLists.txt 3441 John David Duncan 2011-08-12 [merge] Merge from mainline mysql-5.5-cluster modified: storage/ndb/clusterj/CMakeLists.txt storage/ndb/clusterj/clusterj-api/CMakeLists.txt storage/ndb/clusterj/clusterj-core/CMakeLists.txt storage/ndb/clusterj/clusterj-jpatest/CMakeLists.txt storage/ndb/clusterj/clusterj-openjpa/CMakeLists.txt storage/ndb/clusterj/clusterj-tie/CMakeLists.txt storage/ndb/src/ndbjtie/jtie/test/myjapi/CMakeLists.txt storage/ndb/src/ndbjtie/jtie/test/unload/CMakeLists.txt storage/ndb/src/ndbjtie/test/CMakeLists.txt 3440 John David Duncan 2011-07-21 [merge] Merge removed: include/probes_mysql_nodtrace.h modified: storage/ndb/clusterj/CMakeLists.txt storage/ndb/clusterj/clusterj-api/CMakeLists.txt storage/ndb/clusterj/clusterj-core/CMakeLists.txt storage/ndb/clusterj/clusterj-jpatest/CMakeLists.txt storage/ndb/clusterj/clusterj-openjpa/CMakeLists.txt storage/ndb/clusterj/clusterj-test/CMakeLists.txt storage/ndb/clusterj/clusterj-tie/CMakeLists.txt storage/ndb/config/type_JAVA.cmake storage/ndb/src/ndbjtie/CMakeLists.txt storage/ndb/src/ndbjtie/jtie/CMakeLists.txt storage/ndb/src/ndbjtie/jtie/test/myjapi/CMakeLists.txt storage/ndb/src/ndbjtie/jtie/test/unload/CMakeLists.txt storage/ndb/src/ndbjtie/test/CMakeLists.txt 3439 John David Duncan 2011-07-21 [merge] Merge modified: mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict_epoch.result mysql-test/suite/ndb_rpl/t/disabled.def mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_epoch.cnf mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_epoch.test 3438 John David Duncan 2011-07-21 Pull latest NDB/Memcache code into storage/ndb/src/memcache with CMake integration. added: storage/ndb/src/memcache/ storage/ndb/src/memcache/CMakeLists.txt storage/ndb/src/memcache/FindMemcached.cmake storage/ndb/src/memcache/atomics.cmake storage/ndb/src/memcache/cache-src/ storage/ndb/src/memcache/cache-src/LICENSE storage/ndb/src/memcache/cache-src/assoc.c storage/ndb/src/memcache/cache-src/assoc.h storage/ndb/src/memcache/cache-src/default_engine.c storage/ndb/src/memcache/cache-src/default_engine.h storage/ndb/src/memcache/cache-src/items.c storage/ndb/src/memcache/cache-src/items.h storage/ndb/src/memcache/cache-src/slabs.c storage/ndb/src/memcache/cache-src/slabs.h storage/ndb/src/memcache/cache-src/trace.h storage/ndb/src/memcache/include/ storage/ndb/src/memcache/include/ClusterConnectionPool.h storage/ndb/src/memcache/include/Configuration.h storage/ndb/src/memcache/include/DataTypeHandler.h storage/ndb/src/memcache/include/KeyPrefix.h storage/ndb/src/memcache/include/NdbInstance.h storage/ndb/src/memcache/include/Operation.h storage/ndb/src/memcache/include/QueryPlan.h storage/ndb/src/memcache/include/Queue.h storage/ndb/src/memcache/include/Record.h storage/ndb/src/memcache/include/Scheduler.h storage/ndb/src/memcache/include/TabSeparatedValues.h storage/ndb/src/memcache/include/TableSpec.h storage/ndb/src/memcache/include/atomics.h storage/ndb/src/memcache/include/debug.h storage/ndb/src/memcache/include/hash_item_util.h storage/ndb/src/memcache/include/ndb_configuration.h storage/ndb/src/memcache/include/ndb_engine.h storage/ndb/src/memcache/include/ndb_pipeline.h storage/ndb/src/memcache/include/ndb_worker.h storage/ndb/src/memcache/include/ndbmemcache_config.h storage/ndb/src/memcache/include/ndbmemcache_config.in storage/ndb/src/memcache/include/ndbmemcache_global.h storage/ndb/src/memcache/include/status_block.h storage/ndb/src/memcache/include/thread_identifier.h storage/ndb/src/memcache/include/timing.h storage/ndb/src/memcache/include/workitem.h storage/ndb/src/memcache/include/workqueue.h storage/ndb/src/memcache/scripts/ storage/ndb/src/memcache/scripts/ndb_memcache_metadata.sql storage/ndb/src/memcache/scripts/pmpstack.awk storage/ndb/src/memcache/src/ storage/ndb/src/memcache/src/ClusterConnectionPool.cc storage/ndb/src/memcache/src/Configuration.cc storage/ndb/src/memcache/src/DataTypeHandler.cc storage/ndb/src/memcache/src/KeyPrefix.cc storage/ndb/src/memcache/src/NdbInstance.cc storage/ndb/src/memcache/src/Operation.cc storage/ndb/src/memcache/src/QueryPlan.cc storage/ndb/src/memcache/src/Record.cc storage/ndb/src/memcache/src/TabSeparatedValues.cc storage/ndb/src/memcache/src/TableSpec.cc storage/ndb/src/memcache/src/atomics.c storage/ndb/src/memcache/src/debug.c storage/ndb/src/memcache/src/embedded_default_engine.c storage/ndb/src/memcache/src/hash_item_util.c storage/ndb/src/memcache/src/ndb_configuration.cc storage/ndb/src/memcache/src/ndb_engine.c storage/ndb/src/memcache/src/ndb_engine_private.h storage/ndb/src/memcache/src/ndb_pipeline.cc storage/ndb/src/memcache/src/ndb_worker.cc storage/ndb/src/memcache/src/schedulers/ storage/ndb/src/memcache/src/schedulers/S_sched.cc storage/ndb/src/memcache/src/schedulers/S_sched.h storage/ndb/src/memcache/src/schedulers/Stockholm.cc storage/ndb/src/memcache/src/schedulers/Stockholm.h storage/ndb/src/memcache/src/thread_identifier.c storage/ndb/src/memcache/src/timing.c storage/ndb/src/memcache/src/workitem.c storage/ndb/src/memcache/src/workqueue.c storage/ndb/src/memcache/unit/ storage/ndb/src/memcache/unit/CMakeLists.txt storage/ndb/src/memcache/unit/all_tests.h storage/ndb/src/memcache/unit/alloc.cc storage/ndb/src/memcache/unit/cas.cc storage/ndb/src/memcache/unit/casbits.cc storage/ndb/src/memcache/unit/connpool.cc storage/ndb/src/memcache/unit/harness.cc storage/ndb/src/memcache/unit/incr.cc storage/ndb/src/memcache/unit/queue.cc storage/ndb/src/memcache/unit/stub_logger.c storage/ndb/src/memcache/unit/test_workqueue.c storage/ndb/src/memcache/unit/tsv.cc modified: storage/ndb/src/CMakeLists.txt 3437 John David Duncan 2011-07-14 (Tentative commit) Install public header files for NDBAPI and MGMAPI modified: storage/ndb/include/CMakeLists.txt 3436 John David Duncan 2011-07-13 Merge revised Multi-NDB-wait API from cluster-7.2-multiwait renamed: storage/ndb/include/ndbapi/NdbPollGroup.hpp => storage/ndb/include/ndbapi/NdbWaitGroup.hpp storage/ndb/src/ndbapi/NdbPollGroup.cpp => storage/ndb/src/ndbapi/NdbWaitGroup.cpp modified: storage/ndb/include/ndbapi/Ndb.hpp storage/ndb/include/ndbapi/NdbApi.hpp storage/ndb/include/ndbapi/ndb_cluster_connection.hpp storage/ndb/src/ndbapi/API.hpp storage/ndb/src/ndbapi/CMakeLists.txt storage/ndb/src/ndbapi/WakeupHandler.cpp storage/ndb/src/ndbapi/WakeupHandler.hpp storage/ndb/src/ndbapi/ndb_cluster_connection.cpp storage/ndb/src/ndbapi/ndb_cluster_connection_impl.hpp storage/ndb/test/ndbapi/testAsynchMultiwait.cpp storage/ndb/test/run-test/daily-devel-tests.txt storage/ndb/include/ndbapi/NdbWaitGroup.hpp storage/ndb/src/ndbapi/NdbWaitGroup.cpp Diff too large for email (18469 lines, the limit is 10000). No bundle (reason: useless for push emails).