From: John David Duncan
Date: October 12 2011 2:02am
Subject: bzr push into mysql-5.5-cluster branch (john.duncan:3592 to 3595)
List-Archive: http://lists.mysql.com/commits/141389
Message-Id: <201110120202.p9C22qnn003712@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3595 John David Duncan	2011-10-11
      clean up closing braces

    modified:
      storage/ndb/memcache/extra/memcached/engines/default_engine/default_engine.c
 3594 John David Duncan	2011-10-09
      Copy in change to memcached's default_engine.c from mysql-5.5.-cluster-rel

    modified:
      storage/ndb/memcache/extra/memcached/engines/default_engine/default_engine.c
 3593 John David Duncan	2011-10-07
      Fix dup_numbers bug that caused ASCII INCR test to fail.  (Value length no longer includes trailing null)

    modified:
      storage/ndb/memcache/src/ndb_worker.cc
 3592 John David Duncan	2011-10-02
      thread main functions should return, rather than call pthread_exit()

    modified:
      storage/ndb/memcache/src/schedulers/S_sched.cc
=== modified file 'storage/ndb/memcache/extra/memcached/engines/default_engine/default_engine.c'
--- a/storage/ndb/memcache/extra/memcached/engines/default_engine/default_engine.c	2011-09-20 05:13:01 +0000
+++ b/storage/ndb/memcache/extra/memcached/engines/default_engine/default_engine.c	2011-10-12 02:01:43 +0000
@@ -217,16 +217,12 @@ ENGINE_ERROR_CODE create_instance(uint64
       .tap_connections = {
          .lock = PTHREAD_MUTEX_INITIALIZER,
          .size = 10,
-      },
-      .info.engine_info = {
-           .description = "Default engine v0.1",
-           .num_features = 1,
-           .features = {
-               [0].feature = ENGINE_FEATURE_LRU
-           }
-       }
-   };
-
+      }
+  };
+  default_engine.info.engine_info.description = "Default engine v0.1";
+  default_engine.info.engine_info.num_features = 1;
+  default_engine.info.engine_info.features[0].feature = ENGINE_FEATURE_LRU;
+    
    *engine = default_engine;
    engine->tap_connections.clients = calloc(default_engine.tap_connections.size, sizeof(void*));
    if (engine->tap_connections.clients == NULL) {

=== modified file 'storage/ndb/memcache/src/ndb_worker.cc'
--- a/storage/ndb/memcache/src/ndb_worker.cc	2011-10-02 02:58:36 +0000
+++ b/storage/ndb/memcache/src/ndb_worker.cc	2011-10-07 20:38:22 +0000
@@ -827,7 +827,6 @@ bool build_hash_item(workitem *wqitem, O
        && ! (op.isNull(COL_STORE_MATH))) {
       /* in dup_numbers mode, copy the math value */
       ncopied = op.copyValue(COL_STORE_MATH, data_ptr);
-      ncopied-- ; // drop the trailing null
     }
     else {
       /* Build a result containing each column */

No bundle (reason: useless for push emails).