From: John David Duncan Date: April 7 2011 7:35pm Subject: bzr commit into mysql-5.1-telco-7.2 branch (john.duncan:4155) List-Archive: http://lists.mysql.com/commits/134986 Message-Id: <201104071935.p37JZChh016952@acsmt358.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0677866156==" --===============0677866156== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///Users/jdd/bzr-repo/working/cluster-7.2-bernd/ based on revid:bocklin@stripped 4155 John David Duncan 2011-04-07 Fix build errors under unit/ modified: storage/ndb/memcache/src/timing.c storage/ndb/memcache/unit/Makefile.am storage/ndb/memcache/unit/harness.cc === modified file 'storage/ndb/memcache/src/timing.c' --- a/storage/ndb/memcache/src/timing.c 2011-04-07 11:20:56 +0000 +++ b/storage/ndb/memcache/src/timing.c 2011-04-07 19:34:50 +0000 @@ -69,7 +69,7 @@ Uint64 timing_point(time_point_t *t) { #else -uint64_t timing_point(time_point_t *t) { +Uint64 timing_point(time_point_t *t) { return 0; } === modified file 'storage/ndb/memcache/unit/Makefile.am' --- a/storage/ndb/memcache/unit/Makefile.am 2011-04-07 11:20:56 +0000 +++ b/storage/ndb/memcache/unit/Makefile.am 2011-04-07 19:34:50 +0000 @@ -16,19 +16,18 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA # 02110-1301 USA -noinst_PROGRAMS = run_unit_tests test_workqueue +noinst_PROGRAMS = test_workqueue run_unit_tests TESTS = $(noinst_PROGRAMS) # --------------- run_unit_tests --------------------------- run_unit_tests_CPPFLAGS = \ - -DDEBUG_OUTPUT \ - -I${top_srcdir}/storage/ndb/memcache \ - -I${top_srcdir}/storage/ndb/memcache/include \ - -I@MEMCACHE_PATH@/include \ - -I$(top_srcdir)/storage/ndb/include \ - -I$(top_srcdir)/storage/ndb/include/mgmapi \ - -I$(top_srcdir)/storage/ndb/include/ndbapi + -DDEBUG_OUTPUT \ + -I${top_srcdir}/storage/ndb/memcache/ \ + -I${top_srcdir}/storage/ndb/memcache/include \ + -I@MEMCACHE_PATH@/include \ + -I$(top_srcdir)/storage/ndb/include \ + -I$(top_srcdir)/storage/ndb/include/ndbapi run_unit_tests_SOURCES = harness.cc \ all_tests.h \ @@ -40,45 +39,14 @@ run_unit_tests_SOURCES = harness.cc \ connpool.cc run_unit_tests_CFLAGS = -g -O0 \ - -I${top_srcdir}/storage/ndb/memcache \ - -I${top_srcdir}/storage/ndb/memcache/include \ - -I$(top_srcdir)/storage/ndb/include \ - -I$(top_srcdir)/storage/ndb/include/mgmapi \ - -I$(top_srcdir)/storage/ndb/include/ndbapi + -I${top_srcdir}/storage/ndb/memcache \ + -I${top_srcdir}/storage/ndb/memcache/include \ + -I$(top_srcdir)/storage/ndb/include \ + -I$(top_srcdir)/storage/ndb/include/ndbapi run_unit_test_CXXFLAGS = -g -O0 -# from: ls -1 ../*.lo | sort | awk '{print $1 " \\"}' run_unit_tests_LDADD = ../.libs/ndb_engine.a - -files= ../ndb_engine_la-3thread.lo \ - ../ndb_engine_la-ClusterConnectionPool.lo \ - ../ndb_engine_la-Configuration.lo \ - ../ndb_engine_la-DataTypeHandler.lo \ - ../ndb_engine_la-KeyPrefix.lo \ - ../ndb_engine_la-NdbInstance.lo \ - ../ndb_engine_la-QueryPlan.lo \ - ../ndb_engine_la-Record.lo \ - ../ndb_engine_la-Stockholm.lo \ - ../ndb_engine_la-TableSpec.lo \ - #../ndb_engine_la-assoc.lo \ - ../ndb_engine_la-atomics.lo \ - ../ndb_engine_la-debug.lo \ - ../ndb_engine_la-embedded_default_engine.lo \ - ../ndb_engine_la-Flex.lo \ - ../ndb_engine_la-Flex_broker.lo \ - ../ndb_engine_la-Flex_cluster.lo \ - ../ndb_engine_la-hash_item_util.lo \ - ../ndb_engine_la-items.lo \ - ../ndb_engine_la-ndb_configuration.lo \ - ../ndb_engine_la-ndb_engine.lo \ - ../ndb_engine_la-ndb_pipeline.lo \ - ../ndb_engine_la-ndb_worker.lo \ - ../ndb_engine_la-slabs.lo \ - ../ndb_engine_la-thread_identifier.lo \ - ../ndb_engine_la-timing.lo \ - ../ndb_engine_la-workitem.lo \ - ../ndb_engine_la-workqueue.lo run_unit_tests_LDFLAGS = \ -L@MEMCACHE_PATH@/lib/memcached \ @@ -86,7 +54,7 @@ run_unit_tests_LDFLAGS = \ -L$(top_srcdir)/storage/ndb/src/.libs \ -L$(top_srcdir)/mysys/.libs \ -L$(top_srcdir)/strings/.libs \ - -lndbclient -lmysys -lmystrings -ldl -lstdc++ + -lndbclient -lmysys -lmystrings -ldl # --------------- test_workqueue -------------------------- @@ -94,10 +62,8 @@ test_workqueue_CPPFLAGS = \ -I${top_srcdir}/storage/ndb/memcache \ -I${top_srcdir}/storage/ndb/memcache/include \ -I$(top_srcdir)/storage/ndb/include \ - -I$(top_srcdir)/storage/ndb/include/mgmapi \ -I$(top_srcdir)/storage/ndb/include/ndbapi -test_workqueue_LDFLAGS = -lstdc++ test_workqueue_CFLAGS = -g -O2 test_workqueue_SOURCES = test_workqueue.c test_workqueue_LDADD = ../ndb_engine_la-workqueue.lo \ === modified file 'storage/ndb/memcache/unit/harness.cc' --- a/storage/ndb/memcache/unit/harness.cc 2011-03-30 06:54:53 +0000 +++ b/storage/ndb/memcache/unit/harness.cc 2011-04-07 19:34:50 +0000 @@ -36,10 +36,14 @@ char *connect_string; /* exported to tests */ EXTENSION_LOGGER_DESCRIPTOR* get_stderr_logger(void); + +EXTENSION_LOGGER_DESCRIPTOR *logger; Ndb_cluster_connection * connect(const char *); int main(int argc, char *argv[]) { + logger = get_stderr_logger(); + int test_number = -1; char * test_name = 0; if(argc > 1) connect_string = argv[1]; --===============0677866156== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/john.duncan@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: john.duncan@stripped # target_branch: file:///Users/jdd/bzr-repo/working/cluster-7.2-bernd/ # testament_sha1: 872b72d177f8c51aab668eea1e02b2967e2d5350 # timestamp: 2011-04-07 12:35:05 -0700 # base_revision_id: bocklin@stripped\ # sjwa2mazha556omi # # Begin bundle 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 +SA= --===============0677866156==--