From: John David Duncan Date: October 3 2011 6:11pm Subject: bzr push into mysql-5.5-cluster branch (john.duncan:3565 to 3567) List-Archive: http://lists.mysql.com/commits/141287 Message-Id: <201110031812.p93ICD5s030727@acsmt356.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3567 John David Duncan 2011-10-03 Add line that somehow got deleted (!??) modified: storage/ndb/memcache/CMakeLists.txt 3566 John David Duncan 2011-10-03 [merge] This is a newly created mysql-cluster-7.2-labs-memcached branch, branched today from mysql-5.5-cluster. The old branch of this name I renamed to mysql-cluster-memcached-april-preview. This commit merges in mysql-5.5-cluster-mc-1.6 removed: mysql-test/suite/ndb/t/memcache_basic.test 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 added: mysql-test/suite/ndb_memcache/include/wait_for_reconf.inc mysql-test/suite/ndb_memcache/r/type_numeric.result mysql-test/suite/ndb_memcache/t/type_numeric.test storage/ndb/memcache/extra/ storage/ndb/memcache/extra/libevent/ storage/ndb/memcache/extra/libevent/CMakeLists.txt storage/ndb/memcache/extra/libevent/Doxyfile storage/ndb/memcache/extra/libevent/README storage/ndb/memcache/extra/libevent/WIN32-Code/ storage/ndb/memcache/extra/libevent/WIN32-Code/event-config.h storage/ndb/memcache/extra/libevent/WIN32-Code/misc.c storage/ndb/memcache/extra/libevent/WIN32-Code/misc.h storage/ndb/memcache/extra/libevent/WIN32-Code/tree.h storage/ndb/memcache/extra/libevent/WIN32-Code/win32.c storage/ndb/memcache/extra/libevent/WIN32-Prj/ storage/ndb/memcache/extra/libevent/WIN32-Prj/libevent.dsp storage/ndb/memcache/extra/libevent/WIN32-Prj/libevent.dsw storage/ndb/memcache/extra/libevent/WIN32-Prj/libevent.sln storage/ndb/memcache/extra/libevent/buffer.c storage/ndb/memcache/extra/libevent/compat/ storage/ndb/memcache/extra/libevent/compat/sys/ storage/ndb/memcache/extra/libevent/compat/sys/_time.h storage/ndb/memcache/extra/libevent/compat/sys/queue.h storage/ndb/memcache/extra/libevent/devpoll.c storage/ndb/memcache/extra/libevent/epoll.c storage/ndb/memcache/extra/libevent/epoll_sub.c storage/ndb/memcache/extra/libevent/evbuffer.c storage/ndb/memcache/extra/libevent/evdns.3 storage/ndb/memcache/extra/libevent/evdns.c storage/ndb/memcache/extra/libevent/evdns.h storage/ndb/memcache/extra/libevent/event-internal.h storage/ndb/memcache/extra/libevent/event.3 storage/ndb/memcache/extra/libevent/event.c storage/ndb/memcache/extra/libevent/event.h storage/ndb/memcache/extra/libevent/event_rpcgen.py storage/ndb/memcache/extra/libevent/event_tagging.c storage/ndb/memcache/extra/libevent/evhttp.h storage/ndb/memcache/extra/libevent/evport.c storage/ndb/memcache/extra/libevent/evrpc-internal.h storage/ndb/memcache/extra/libevent/evrpc.c storage/ndb/memcache/extra/libevent/evrpc.h storage/ndb/memcache/extra/libevent/evsignal.h storage/ndb/memcache/extra/libevent/evutil.c storage/ndb/memcache/extra/libevent/evutil.h storage/ndb/memcache/extra/libevent/http-internal.h storage/ndb/memcache/extra/libevent/http.c storage/ndb/memcache/extra/libevent/kqueue.c storage/ndb/memcache/extra/libevent/log.c storage/ndb/memcache/extra/libevent/log.h storage/ndb/memcache/extra/libevent/min_heap.h storage/ndb/memcache/extra/libevent/poll.c storage/ndb/memcache/extra/libevent/sample/ storage/ndb/memcache/extra/libevent/sample/Makefile.am storage/ndb/memcache/extra/libevent/sample/event-test.c storage/ndb/memcache/extra/libevent/sample/signal-test.c storage/ndb/memcache/extra/libevent/sample/time-test.c storage/ndb/memcache/extra/libevent/select.c storage/ndb/memcache/extra/libevent/signal.c storage/ndb/memcache/extra/libevent/strlcpy-internal.h storage/ndb/memcache/extra/libevent/strlcpy.c storage/ndb/memcache/extra/libevent/test/ storage/ndb/memcache/extra/libevent/test/Makefile.am storage/ndb/memcache/extra/libevent/test/bench.c storage/ndb/memcache/extra/libevent/test/regress.c storage/ndb/memcache/extra/libevent/test/regress.gen.c storage/ndb/memcache/extra/libevent/test/regress.gen.h storage/ndb/memcache/extra/libevent/test/regress.h storage/ndb/memcache/extra/libevent/test/regress.rpc storage/ndb/memcache/extra/libevent/test/regress_dns.c storage/ndb/memcache/extra/libevent/test/regress_http.c storage/ndb/memcache/extra/libevent/test/regress_rpc.c storage/ndb/memcache/extra/libevent/test/test-eof.c storage/ndb/memcache/extra/libevent/test/test-init.c storage/ndb/memcache/extra/libevent/test/test-time.c storage/ndb/memcache/extra/libevent/test/test-weof.c storage/ndb/memcache/extra/libevent/test/test.sh storage/ndb/memcache/extra/memcached/ storage/ndb/memcache/extra/memcached/AUTHORS storage/ndb/memcache/extra/memcached/CMakeLists.txt storage/ndb/memcache/extra/memcached/LICENSE storage/ndb/memcache/extra/memcached/config_static.h storage/ndb/memcache/extra/memcached/config_tests.in storage/ndb/memcache/extra/memcached/daemon/ storage/ndb/memcache/extra/memcached/daemon/cache.c storage/ndb/memcache/extra/memcached/daemon/cache.h storage/ndb/memcache/extra/memcached/daemon/daemon.c storage/ndb/memcache/extra/memcached/daemon/hash.c storage/ndb/memcache/extra/memcached/daemon/hash.h storage/ndb/memcache/extra/memcached/daemon/isasl.c storage/ndb/memcache/extra/memcached/daemon/isasl.h storage/ndb/memcache/extra/memcached/daemon/memcached.c storage/ndb/memcache/extra/memcached/daemon/memcached.h storage/ndb/memcache/extra/memcached/daemon/sasl_defs.c storage/ndb/memcache/extra/memcached/daemon/sasl_defs.h storage/ndb/memcache/extra/memcached/daemon/solaris_priv.c storage/ndb/memcache/extra/memcached/daemon/stats.c storage/ndb/memcache/extra/memcached/daemon/stats.h storage/ndb/memcache/extra/memcached/daemon/thread.c storage/ndb/memcache/extra/memcached/daemon/topkeys.c storage/ndb/memcache/extra/memcached/daemon/topkeys.h storage/ndb/memcache/extra/memcached/engines/ storage/ndb/memcache/extra/memcached/engines/default_engine/ storage/ndb/memcache/extra/memcached/engines/default_engine/assoc.c storage/ndb/memcache/extra/memcached/engines/default_engine/assoc.h storage/ndb/memcache/extra/memcached/engines/default_engine/default_engine.c storage/ndb/memcache/extra/memcached/engines/default_engine/default_engine.h storage/ndb/memcache/extra/memcached/engines/default_engine/items.c storage/ndb/memcache/extra/memcached/engines/default_engine/items.h storage/ndb/memcache/extra/memcached/engines/default_engine/slabs.c storage/ndb/memcache/extra/memcached/engines/default_engine/slabs.h storage/ndb/memcache/extra/memcached/extensions/ storage/ndb/memcache/extra/memcached/extensions/daemon/ storage/ndb/memcache/extra/memcached/extensions/daemon/stdin_check.c storage/ndb/memcache/extra/memcached/extensions/loggers/ storage/ndb/memcache/extra/memcached/extensions/loggers/blackhole_logger.c storage/ndb/memcache/extra/memcached/extensions/loggers/eventlog_logger.c storage/ndb/memcache/extra/memcached/extensions/loggers/syslog_logger.c storage/ndb/memcache/extra/memcached/extensions/protocol/ storage/ndb/memcache/extra/memcached/extensions/protocol/ascii_scrub.c storage/ndb/memcache/extra/memcached/extensions/protocol/example_protocol.c storage/ndb/memcache/extra/memcached/extensions/protocol/fragment_rw.c storage/ndb/memcache/extra/memcached/extensions/protocol/fragment_rw.h storage/ndb/memcache/extra/memcached/extensions/protocol_extension.h storage/ndb/memcache/extra/memcached/include/ storage/ndb/memcache/extra/memcached/include/memcached/ storage/ndb/memcache/extra/memcached/include/memcached/callback.h storage/ndb/memcache/extra/memcached/include/memcached/config_parser.h storage/ndb/memcache/extra/memcached/include/memcached/engine.h storage/ndb/memcache/extra/memcached/include/memcached/engine_common.h storage/ndb/memcache/extra/memcached/include/memcached/engine_testapp.h storage/ndb/memcache/extra/memcached/include/memcached/extension.h storage/ndb/memcache/extra/memcached/include/memcached/extension_loggers.h storage/ndb/memcache/extra/memcached/include/memcached/genhash.h storage/ndb/memcache/extra/memcached/include/memcached/protocol_binary.h storage/ndb/memcache/extra/memcached/include/memcached/protocol_plugin.h storage/ndb/memcache/extra/memcached/include/memcached/server_api.h storage/ndb/memcache/extra/memcached/include/memcached/types.h storage/ndb/memcache/extra/memcached/include/memcached/util.h storage/ndb/memcache/extra/memcached/include/memcached/vbucket.h storage/ndb/memcache/extra/memcached/include/memcached/visibility.h storage/ndb/memcache/extra/memcached/programs/ storage/ndb/memcache/extra/memcached/programs/engine_testapp.c storage/ndb/memcache/extra/memcached/programs/mcstat.c storage/ndb/memcache/extra/memcached/programs/mock_server.c storage/ndb/memcache/extra/memcached/programs/mock_server.h storage/ndb/memcache/extra/memcached/programs/sizes.c storage/ndb/memcache/extra/memcached/programs/testapp.c storage/ndb/memcache/extra/memcached/programs/timedrun.c storage/ndb/memcache/extra/memcached/t/ storage/ndb/memcache/extra/memcached/t/00-startup.t storage/ndb/memcache/extra/memcached/t/64bit.t storage/ndb/memcache/extra/memcached/t/binary-get.t storage/ndb/memcache/extra/memcached/t/binary-sasl.t.in storage/ndb/memcache/extra/memcached/t/binary.t storage/ndb/memcache/extra/memcached/t/bogus-commands.t storage/ndb/memcache/extra/memcached/t/cas.t storage/ndb/memcache/extra/memcached/t/cmd_extensions.t storage/ndb/memcache/extra/memcached/t/daemonize.t storage/ndb/memcache/extra/memcached/t/dash-M.t storage/ndb/memcache/extra/memcached/t/evictions.t storage/ndb/memcache/extra/memcached/t/expirations.t storage/ndb/memcache/extra/memcached/t/flags.t storage/ndb/memcache/extra/memcached/t/flush-all.t storage/ndb/memcache/extra/memcached/t/getset.t storage/ndb/memcache/extra/memcached/t/incrdecr.t storage/ndb/memcache/extra/memcached/t/issue_104.t storage/ndb/memcache/extra/memcached/t/issue_108.t storage/ndb/memcache/extra/memcached/t/issue_14.t storage/ndb/memcache/extra/memcached/t/issue_140.t storage/ndb/memcache/extra/memcached/t/issue_152.t storage/ndb/memcache/extra/memcached/t/issue_163.t storage/ndb/memcache/extra/memcached/t/issue_183.t storage/ndb/memcache/extra/memcached/t/issue_22.t storage/ndb/memcache/extra/memcached/t/issue_29.t storage/ndb/memcache/extra/memcached/t/issue_3.t storage/ndb/memcache/extra/memcached/t/issue_41.t storage/ndb/memcache/extra/memcached/t/issue_42.t storage/ndb/memcache/extra/memcached/t/issue_50.t storage/ndb/memcache/extra/memcached/t/issue_61.t storage/ndb/memcache/extra/memcached/t/issue_67.t storage/ndb/memcache/extra/memcached/t/issue_68.t storage/ndb/memcache/extra/memcached/t/issue_70.t storage/ndb/memcache/extra/memcached/t/item_size_max.t storage/ndb/memcache/extra/memcached/t/lib/ storage/ndb/memcache/extra/memcached/t/lib/MemcachedTest.pm storage/ndb/memcache/extra/memcached/t/line-lengths.t storage/ndb/memcache/extra/memcached/t/lru.t storage/ndb/memcache/extra/memcached/t/maxconns.t storage/ndb/memcache/extra/memcached/t/multiversioning.t storage/ndb/memcache/extra/memcached/t/noreply.t storage/ndb/memcache/extra/memcached/t/sasl/ storage/ndb/memcache/extra/memcached/t/sasl/memcached.conf storage/ndb/memcache/extra/memcached/t/scrub.t storage/ndb/memcache/extra/memcached/t/stats-detail.t storage/ndb/memcache/extra/memcached/t/stats.t storage/ndb/memcache/extra/memcached/t/stress-memcached.pl storage/ndb/memcache/extra/memcached/t/topkeys.t storage/ndb/memcache/extra/memcached/t/udp.t storage/ndb/memcache/extra/memcached/t/unixsocket.t storage/ndb/memcache/extra/memcached/t/verbosity.t storage/ndb/memcache/extra/memcached/t/whitespace.t storage/ndb/memcache/extra/memcached/testsuite/ storage/ndb/memcache/extra/memcached/testsuite/basic_engine_testsuite.c storage/ndb/memcache/extra/memcached/testsuite/basic_engine_testsuite.h storage/ndb/memcache/extra/memcached/testsuite/breakdancer/ storage/ndb/memcache/extra/memcached/testsuite/breakdancer/breakdancer.py storage/ndb/memcache/extra/memcached/testsuite/breakdancer/engine_test.py storage/ndb/memcache/extra/memcached/testsuite/breakdancer/suite_stubs.c storage/ndb/memcache/extra/memcached/testsuite/breakdancer/suite_stubs.h storage/ndb/memcache/extra/memcached/trace.h storage/ndb/memcache/extra/memcached/utilities/ storage/ndb/memcache/extra/memcached/utilities/config_parser.c storage/ndb/memcache/extra/memcached/utilities/engine_loader.c storage/ndb/memcache/extra/memcached/utilities/engine_loader.h storage/ndb/memcache/extra/memcached/utilities/extension_loggers.c storage/ndb/memcache/extra/memcached/utilities/genhash.c storage/ndb/memcache/extra/memcached/utilities/genhash_int.h storage/ndb/memcache/extra/memcached/utilities/util.c storage/ndb/memcache/extra/memcached/win32/ storage/ndb/memcache/extra/memcached/win32/Makefile.mingw storage/ndb/memcache/extra/memcached/win32/config.sh storage/ndb/memcache/extra/memcached/win32/defs.c storage/ndb/memcache/extra/memcached/win32/dlfcn.c storage/ndb/memcache/extra/memcached/win32/dlfcn.h storage/ndb/memcache/extra/memcached/win32/sysexits.h storage/ndb/memcache/extra/memcached/win32/win32.c storage/ndb/memcache/extra/memcached/win32/win32.h storage/ndb/memcache/include/ConnQueryPlanSet.h storage/ndb/memcache/src/ConnQueryPlanSet.cc storage/ndb/memcache/src/stub.cc modified: .bzrignore mysql-test/lib/My/Memcache.pm mysql-test/mysql-test-run.pl mysql-test/suite/ndb_memcache/include/datatypes_tables.inc mysql-test/suite/ndb_memcache/include/memcached_wait_for_ready.inc mysql-test/suite/ndb_memcache/t/reconf1.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/CMakeLists.txt storage/ndb/memcache/FindMemcached.cmake storage/ndb/memcache/atomics.cmake storage/ndb/memcache/include/Config_v1.h storage/ndb/memcache/include/Configuration.h storage/ndb/memcache/include/DataTypeHandler.h storage/ndb/memcache/include/NdbInstance.h storage/ndb/memcache/include/Operation.h storage/ndb/memcache/include/QueryPlan.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/ndbmemcache_config.in storage/ndb/memcache/include/workitem.h storage/ndb/memcache/memcached_path.pl.in storage/ndb/memcache/sandbox.sh.in 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/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/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/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/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 support-files/compiler_warnings.supp 3565 magnus.blaudd@stripped 2011-10-03 [merge] Merge modified: storage/ndb/include/CMakeLists.txt storage/ndb/ndb_configure.cmake Diff too large for email (65145 lines, the limit is 10000). No bundle (reason: useless for push emails).