From: John David Duncan
Date: September 22 2011 5:02am
Subject: bzr push into mysql-5.5-cluster branch (john.duncan:3521 to 3522)
List-Archive: http://lists.mysql.com/commits/141070
Message-Id: <201109220503.p8M53ZP0021020@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3522 John David Duncan	2011-09-21
      merge

    modified:
      storage/ndb/memcache/include/timing.h
      storage/ndb/memcache/src/atomics.c
      storage/ndb/memcache/unit/all_tests.h
 3521 John David Duncan	2011-09-21
      merge

    modified:
      storage/ndb/memcache/include/atomics.h
      storage/ndb/memcache/include/hash_item_util.h
      storage/ndb/memcache/include/ndb_engine.h
=== modified file 'storage/ndb/memcache/include/timing.h'
--- a/storage/ndb/memcache/include/timing.h	2011-09-12 10:05:07 +0000
+++ b/storage/ndb/memcache/include/timing.h	2011-09-22 05:02:00 +0000
@@ -51,9 +51,9 @@ typedef int time_point_t;
 
 /* On platforms without gethrvtime(), define get_thread_time() to 0. */
 #ifdef HAVE_GETHRVTIME
-#define get_thread_vtime(X) gethrvtime(X)
+#define get_thread_vtime() gethrvtime()
 #else
-#define get_thread_vtime(X) 0
+#define get_thread_vtime() 0
 #endif
 
 

=== modified file 'storage/ndb/memcache/src/atomics.c'
--- a/storage/ndb/memcache/src/atomics.c	2011-09-22 03:37:05 +0000
+++ b/storage/ndb/memcache/src/atomics.c	2011-09-22 05:02:00 +0000
@@ -31,7 +31,7 @@ int atomic_cmp_swap_int(ndbmc_atomic32_t
   return (stored_old == old);  
 }
 
-int atomic_cmp_swap_ptr(volatile void **loc, void *old, void *new) {
+int atomic_cmp_swap_ptr(void * volatile *loc, void *old, void *new) {
   void * stored_old;
   
   membar_enter();

=== modified file 'storage/ndb/memcache/unit/all_tests.h'
--- a/storage/ndb/memcache/unit/all_tests.h	2011-09-12 10:05:07 +0000
+++ b/storage/ndb/memcache/unit/all_tests.h	2011-09-22 05:02:00 +0000
@@ -27,7 +27,7 @@
 #define require(x) if(!(x)) return __LINE__;
 #define pass return 0;
 
-#define detail(v, fmt, ...) if(v) printf (fmt, ## __VA_ARGS__)
+#define detail(v, ...) if(v) printf (__VA_ARGS__)
 #define RESULT getNdbError().code
 
 #define REQ_NONE           0

No bundle (reason: useless for push emails).