bzr push into mysql-5.5-cluster branch (john.duncan:3529 to 3530)

[John David Duncan]

 3530 John David Duncan	2011-09-22
      build fixes

    modified:
      storage/ndb/memcache/CMakeLists.txt
      storage/ndb/memcache/atomics.cmake
      storage/ndb/memcache/unit/test_workqueue.c
 3529 John David Duncan	2011-09-22
      Fix some compiler warnings in ndb/memcache

    modified:
      storage/ndb/memcache/include/Config_v1.h
      storage/ndb/memcache/include/Configuration.h
      storage/ndb/memcache/include/Scheduler.h
      storage/ndb/memcache/include/TableSpec.h
      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/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_pipeline.cc
      storage/ndb/memcache/src/ndb_worker.cc
      storage/ndb/memcache/src/schedulers/S_sched.cc
      storage/ndb/memcache/src/schedulers/Stockholm.cc
      storage/ndb/memcache/src/workitem.c
      storage/ndb/memcache/unit/alloc.cc
      storage/ndb/memcache/unit/casbits.cc
      storage/ndb/memcache/unit/incr.cc
      storage/ndb/memcache/unit/test_workqueue.c
=== modified file 'storage/ndb/memcache/CMakeLists.txt'
--- a/storage/ndb/memcache/CMakeLists.txt	2011-09-22 05:56:14 +0000
+++ b/storage/ndb/memcache/CMakeLists.txt	2011-09-22 19:01:58 +0000
@@ -29,6 +29,12 @@ ELSE()
   RETURN()
 ENDIF()  
 
+# Check for atomic operations
+include(atomics.cmake)
+if(NO_ATOMICS)
+  RETURN()
+ENDIF()
+
 # Paths to header files
 include_directories(BEFORE include)
 include_directories(BEFORE cache-src)
@@ -72,9 +78,7 @@ set(NDB_MEMCACHE_SOURCE_FILES
     cache-src/items.c
     cache-src/slabs.c
  )
-
-# Check for atomic operations
-include(atomics.cmake)
+  
 
 # Define DEBUG_OUTPUT by default (enables runtime "debug" option in memcached)
 add_definitions(-DDEBUG_OUTPUT)

=== modified file 'storage/ndb/memcache/atomics.cmake'
--- a/storage/ndb/memcache/atomics.cmake	2011-09-21 08:37:13 +0000
+++ b/storage/ndb/memcache/atomics.cmake	2011-09-22 19:01:58 +0000
@@ -46,6 +46,7 @@ ELSEIF(HAVE_DARWIN_ATOMICS) 
 ELSEIF(HAVE_SOLARIS_ATOMICS)
   MESSAGE(STATUS "Using Solaris <atomic.h>")
 ELSE()
-  MESSAGE(FATAL_ERROR "No atomic functions available")
+  MESSAGE(STATUS "Skipping NDB/Memcache. No atomic functions available.")
+  SET(NO_ATOMICS 1)
 ENDIF()
 

=== modified file 'storage/ndb/memcache/unit/test_workqueue.c'
--- a/storage/ndb/memcache/unit/test_workqueue.c	2011-09-22 18:27:10 +0000
+++ b/storage/ndb/memcache/unit/test_workqueue.c	2011-09-22 19:01:58 +0000
@@ -22,6 +22,7 @@
 #include <stdio.h>
 #include <assert.h>
 #include <time.h>
+#include <sys/types.h>
 
 #include "workqueue.h"
 #include <ndbmemcache_config.h>

No bundle (reason: useless for push emails).