From: John David Duncan
Date: September 22 2011 2:22am
Subject: bzr push into mysql-5.5-cluster branch (john.duncan:3514 to 3515)
List-Archive: http://lists.mysql.com/commits/141066
Message-Id: <201109220222.p8M2MesD023917@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3515 John David Duncan	2011-09-21
      Don't re-declare atomic functions on solaris; they are already declared in atomic.h

    modified:
      storage/ndb/memcache/include/atomics.h
 3514 John David Duncan	2011-09-21
      Reimplement strsep() as it is not available on Solaris.

    modified:
      storage/ndb/memcache/src/QueryPlan.cc
      storage/ndb/memcache/src/TableSpec.cc
=== modified file 'storage/ndb/memcache/include/atomics.h'
--- a/storage/ndb/memcache/include/atomics.h	2011-09-12 10:05:07 +0000
+++ b/storage/ndb/memcache/include/atomics.h	2011-09-22 02:20:45 +0000
@@ -76,16 +76,6 @@ typedef volatile Uint32 ndbmc_atomic32_t
   __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)
-
-#else
-
-DECLARE_FUNCTIONS_WITH_C_LINKAGE
-
-Int32 atomic_add_int(ndbmc_atomic32_t *loc, int amount);
-int atomic_cmp_swap_int(ndbmc_atomic32_t *loc, int oldvalue, int newvalue);
-int atomic_cmp_swap_ptr(void * volatile *loc, void *oldvalue, void *newvalue);
-
-END_FUNCTIONS_WITH_C_LINKAGE
 #endif
 
 #endif

No bundle (reason: useless for push emails).