bzr push into mysql-5.5-cluster branch (john.duncan:3590 to 3591)

[John David Duncan]

 3591 John David Duncan	2011-10-02
      A few more minor fixes for portability & warnings

    modified:
      storage/ndb/memcache/include/TabSeparatedValues.h
      storage/ndb/memcache/src/ndb_configuration.cc
      storage/ndb/memcache/src/workitem.c
 3590 John David Duncan	2011-10-02
      one more warning

    modified:
      storage/ndb/memcache/unit/test_workqueue.c
=== modified file 'storage/ndb/memcache/include/TabSeparatedValues.h'
--- a/storage/ndb/memcache/include/TabSeparatedValues.h	2011-10-02 02:58:36 +0000
+++ b/storage/ndb/memcache/include/TabSeparatedValues.h	2011-10-03 02:53:53 +0000
@@ -31,7 +31,7 @@ class TabSeparatedValues {
   size_t getLength();         // inlined
 
   private:
-  int index;
+  Uint32 index;
   Uint32 parts;
   const char * pointers[MAX_VAL_COLUMNS];
   size_t lengths[MAX_VAL_COLUMNS];

=== modified file 'storage/ndb/memcache/src/ndb_configuration.cc'
--- a/storage/ndb/memcache/src/ndb_configuration.cc	2011-09-21 08:30:46 +0000
+++ b/storage/ndb/memcache/src/ndb_configuration.cc	2011-10-03 02:53:53 +0000
@@ -211,9 +211,10 @@ void * run_reconfig_listener_thread(void
     }
     else {
       DEBUG_PRINT("error (%d); exiting.", i);
-      pthread_exit(NULL);
+      break;
     }
   }
+  return 0;
 }
 
 

=== modified file 'storage/ndb/memcache/src/workitem.c'
--- a/storage/ndb/memcache/src/workitem.c	2011-10-02 02:58:36 +0000
+++ b/storage/ndb/memcache/src/workitem.c	2011-10-03 02:53:53 +0000
@@ -60,7 +60,7 @@ void workitem__initialize(workitem *item
                           prefix_info_t prefix, const void *cookie,
                           int nkey, const char *key)
 {
-  size_t sz;
+  int sz;
   memset(item, 0, sizeof(workitem));      /* zero out the item */
   item->base.nkey = nkey;  
   item->base.verb = verb;

No bundle (reason: useless for push emails).