List:Commits« Previous MessageNext Message »
From:John David Duncan Date:March 22 2012 2:35am
Subject:bzr push into mysql-5.5-cluster-7.2 branch (john.duncan:3855 to 3856)
View as plain text  
 3856 John David Duncan	2012-03-21 [merge]
      merge

    modified:
      storage/ndb/memcache/include/Queue.h
 3855 Frazer Clement	2012-03-21 [merge]
      Merge 7.1->7.2

    modified:
      mysql-test/suite/ndb/r/ndb_add_partition.result
      mysql-test/suite/ndb/t/ndb_add_partition.test
      mysql-test/suite/ndb/t/ndb_addnode.test
      sql/ha_ndbcluster.cc
      sql/handler.h
      sql/sql_table.cc
      storage/ndb/include/util/InputStream.hpp
      storage/ndb/src/common/transporter/Transporter.cpp
      storage/ndb/test/run-test/conf-blade08.cnf
      storage/ndb/test/run-test/conf-ndb07.cnf
      storage/ndb/test/run-test/conf-tyr13.cnf
      storage/ndb/test/run-test/daily-basic-tests.txt
=== modified file 'storage/ndb/memcache/include/Queue.h'
--- a/storage/ndb/memcache/include/Queue.h	2011-09-12 10:05:07 +0000
+++ b/storage/ndb/memcache/include/Queue.h	2012-03-22 02:21:34 +0000
@@ -55,6 +55,7 @@ public:   /* public instance variable */
 public:   /* public interface methods */
   Queue(int maxnodes) {
     /* Initialize the node allocation pool */
+    maxnodes += 1;  // add one for a dummy node at the head.
     assert(sizeof(Node) < CACHE_LINE_SIZE);
     nodepool = (char *) calloc(maxnodes, CACHE_LINE_SIZE);
     nodelist = 0;

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.5-cluster-7.2 branch (john.duncan:3855 to 3856) John David Duncan22 Mar