bzr push into mysql-5.5-cluster branch (john.duncan:3541 to 3542)

[John David Duncan]

 3542 John David Duncan	2011-09-23
      More portability fixes for ndb/memcache/unit/test_workqueue

    modified:
      storage/ndb/memcache/unit/CMakeLists.txt
 3541 John David Duncan	2011-09-23
      Attempt to fix compiler & linker issues with ndb/memcache/unit/test_workqueue
      Remove workitem.base.is_sync

    modified:
      storage/ndb/memcache/include/workitem.h
      storage/ndb/memcache/src/TableSpec.cc
      storage/ndb/memcache/src/ndb_worker.cc
      storage/ndb/memcache/src/workitem.c
      storage/ndb/memcache/unit/CMakeLists.txt
      storage/ndb/memcache/unit/test_workqueue.c
=== modified file 'storage/ndb/memcache/unit/CMakeLists.txt'
--- a/storage/ndb/memcache/unit/CMakeLists.txt	2011-09-23 18:29:30 +0000
+++ b/storage/ndb/memcache/unit/CMakeLists.txt	2011-09-23 19:35:05 +0000
@@ -1,4 +1,6 @@
-# Source files for this module 
+
+
+######### run_unit_tests ##############
 set(UNIT_SOURCE_FILES
     harness.cc
     alloc.cc
@@ -10,12 +12,24 @@ set(UNIT_SOURCE_FILES
     stub_logger.c
     tsv.cc
  )
-
-
 add_executable(run_unit_tests ${UNIT_SOURCE_FILES})
 target_link_libraries(run_unit_tests ndbmemcache)
+##########################################
+
+
+### test_workqueue #####################
+set(TEST_WORKQUEUE_SOURCES test_workqueue.c ../src/workqueue.c) 
+if(HAVE_SOLARIS_ATOMICS) 
+  set(TEST_WORKQUEUE_SOURCES ${TEST_WORKQUEUE_SOURCES} ../src/atomics.c)
+endif()
+
+add_executable(test_workqueue ${TEST_WORKQUEUE_SOURCES})
+
+if(LIBRT) 
+  target_link_libraries(test_workqueue rt)
+endif()
+##########################################
 
-add_executable(test_workqueue test_workqueue.c ../src/workqueue.c)
 
 # Tests which can run without a cluster:
 

No bundle (reason: useless for push emails).