bzr push into mysql-5.5-cluster branch (john.duncan:3519 to 3520)

[John David Duncan]

 3520 John David Duncan	2011-09-21
      merge

    modified:
      storage/ndb/memcache/include/atomics.h
      storage/ndb/memcache/include/ndbmemcache_config.in
      storage/ndb/memcache/src/atomics.c
 3519 John David Duncan	2011-09-21
      merge

    modified:
      storage/ndb/memcache/include/atomics.h
=== modified file 'storage/ndb/memcache/include/atomics.h'
--- a/storage/ndb/memcache/include/atomics.h	2011-09-22 02:22:59 +0000
+++ b/storage/ndb/memcache/include/atomics.h	2011-09-22 03:37:05 +0000
@@ -67,7 +67,6 @@ typedef volatile Uint32 ndbmc_atomic32_t
 */
 
 #ifdef USE_DARWIN_ATOMICS
-#define atomic_add_int(loc, amount) OSAtomicAdd32Barrier(amount, loc)
 #define atomic_cmp_swap_int(loc, old, new) OSAtomicCompareAndSwap32Barrier(old, new, loc)
 #define atomic_cmp_swap_ptr(loc, old, new) OSAtomicCompareAndSwapPtrBarrier(old, new, loc)
 
@@ -75,7 +74,6 @@ typedef volatile Uint32 ndbmc_atomic32_t
 #define atomic_cmp_swap_int(loc, old, new) \
   __sync_bool_compare_and_swap(loc, (Uint32) old, (Uint32) new)
 #define atomic_cmp_swap_ptr(loc, old, new) __sync_bool_compare_and_swap(loc, old, new)
-#define atomic_add_int(loc, amount) __sync_fetch_and_add(loc, amount)
 #endif
 
 #endif

=== modified file 'storage/ndb/memcache/include/ndbmemcache_config.in'
--- a/storage/ndb/memcache/include/ndbmemcache_config.in	2011-09-17 23:23:26 +0000
+++ b/storage/ndb/memcache/include/ndbmemcache_config.in	2011-09-22 03:37:05 +0000
@@ -25,7 +25,9 @@
 
 #cmakedefine HAVE_MACH_MACH_TIME_H
 #cmakedefine HAVE_SRANDOMDEV
+#ifndef HAVE_GETHRTIME
 #cmakedefine HAVE_GETHRTIME
+#endif
 #cmakedefine HAVE_GETHRVTIME
 #cmakedefine HAVE_MEMSET
 

=== modified file 'storage/ndb/memcache/src/atomics.c'
--- a/storage/ndb/memcache/src/atomics.c	2011-09-12 10:05:07 +0000
+++ b/storage/ndb/memcache/src/atomics.c	2011-09-22 03:37:05 +0000
@@ -44,13 +44,4 @@ int atomic_cmp_swap_ptr_nobarrier(volati
   return (atomic_cas_ptr(loc, old, new) == old);
 }
 
-Int32 atomic_add_int(ndbmc_atomic32_t *loc, Int32 amount) {
-  Int 32 nv;
-
-  membar_enter();
-  nv = atomic_add_32_nv(loc, amount);
-  membar_exit();
-  return nv;
-}
-
 #endif

No bundle (reason: useless for push emails).