From: John David Duncan
Date: July 20 2012 12:11am
Subject: bzr push into mysql-5.5-cluster-7.2 branch (john.duncan:3970 to 3971)
List-Archive: http://lists.mysql.com/commits/144468
Message-Id: <20120720001140.1680.41782.3971@dhcp-whq-twvpn-1-vpnpool-10-159-217-87.vpn.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3971 John David Duncan	2012-07-19
      Fix for warnings in Club.

    modified:
      storage/ndb/memcache/src/Operation.cc
 3970 John David Duncan	2012-07-17
      Fix bugs in NDB+Memcached where multi-part keys were properly supported.

    added:
      mysql-test/suite/ndb_memcache/r/mpart_key.result
      mysql-test/suite/ndb_memcache/t/mpart_key.test
    modified:
      storage/ndb/memcache/include/Operation.h
      storage/ndb/memcache/src/ExternalValue.cc
      storage/ndb/memcache/src/Operation.cc
      storage/ndb/memcache/src/ndb_worker.cc
=== modified file 'storage/ndb/memcache/src/Operation.cc'
--- a/storage/ndb/memcache/src/Operation.cc	2012-07-18 06:54:14 +0000
+++ b/storage/ndb/memcache/src/Operation.cc	2012-07-20 00:10:07 +0000
@@ -111,9 +111,9 @@ NdbIndexScanOperation * Operation::scanI
 
 
 bool Operation::setKey(int nparts, const char *dbkey, size_t key_len ) {
+  bool r = true;
   
   clearKeyNullBits();
-
   if(nparts > 1) {
     TabSeparatedValues tsv(dbkey, nparts, key_len);
     int idx = 0;
@@ -131,12 +131,15 @@ bool Operation::setKey(int nparts, const
     } while (tsv.advance());
   }
   else { 
-    return setKeyPart(COL_STORE_KEY, dbkey, key_len);
+    r = setKeyPart(COL_STORE_KEY, dbkey, key_len);
   }
+  return r;
 }
 
 
 bool Operation::setKeyFieldsInRow(int nparts, const char *dbkey, size_t key_len ) {
+  bool r = true;
+  
   if(nparts > 1) {
     TabSeparatedValues tsv(dbkey, nparts, key_len);
     int idx = 0;
@@ -154,8 +157,9 @@ bool Operation::setKeyFieldsInRow(int np
     } while (tsv.advance());
   }
   else {
-    return setColumn(COL_STORE_KEY, dbkey, key_len);
+    r = setColumn(COL_STORE_KEY, dbkey, key_len);
   }
+  return r;
 }
 
 

No bundle (reason: useless for push emails).