bzr commit into mysql-5.1-telco-7.2 branch (john.duncan:4155)

[John David Duncan]

#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];


Attachment: [text/bzr-bundle] bzr/[e-mail]