From: Mikael Ronstrom
Date: December 20 2011 1:26pm
Subject: bzr push into mysql-5.5-cluster-7.2 branch (mikael.ronstrom:3664 to 3669)
List-Archive: http://lists.mysql.com/commits/142208
Message-Id: <201112201327.pBKDR7Gr005756@dator6>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3669 Mikael Ronstrom	2011-12-20 [merge]
      null merge

 3668 Mikael Ronstrom	2011-12-20 [merge]
      merge

 3667 Mikael Ronstrom	2011-12-20 [merge]
      merge

    modified:
      storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp
 3666 Mikael Ronstrom	2011-12-20
      Removed some code not to be pushed

    modified:
      storage/ndb/include/transporter/TransporterRegistry.hpp
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
      storage/ndb/test/src/CpcClient.cpp
 3665 Mikael Ronstrom	2011-12-20 [merge]
      merge

 3664 Mikael Ronstrom	2011-12-20
      Final fixes to get ndbmtd working for multiple receive threads

    modified:
      mysql-test/suite/ndb/r/ndb_basic.result
      storage/ndb/src/kernel/blocks/trpman.cpp
=== modified file 'storage/ndb/include/transporter/TransporterRegistry.hpp'
--- a/storage/ndb/include/transporter/TransporterRegistry.hpp	revid:mikael.ronstrom@stripped
+++ b/storage/ndb/include/transporter/TransporterRegistry.hpp	revid:mikael.ronstrom@stripped
@@ -43,7 +43,6 @@
 
 #include <NodeBitmask.hpp>
 
-#define DEBUG_TRANSPORTER
 // A transporter is always in an IOState.
 // NoHalt is used initially and as long as it is no restrictions on
 // sending or receiving.

=== modified file 'storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp'
--- a/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	revid:mikael.ronstrom@stripped
+++ b/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	revid:mikael.ronstrom@stripped
@@ -25132,9 +25132,7 @@ Dbdict::handleClientReq(Signal* signal, 
   DictSignal::addRequestExtra(requestInfo, op_ptr.p->m_requestInfo);
 
   trans_ptr.p->m_ref_nodes.clear();
-  ndbout_c("before crash");
   trans_ptr.p->m_nodes.bitAND(c_aliveNodes);
-  ndbout_c("after crash");
   NdbNodeBitmask nodes = trans_ptr.p->m_nodes;
 
   NodeReceiverGroup rg(DBDICT, nodes);

=== modified file 'storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp'
--- a/storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp	revid:mikael.ronstrom@stripped
+++ b/storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp	revid:mikael.ronstrom@stripped
@@ -812,8 +812,6 @@ private:
 
   void execALTER_TAB_REQ(Signal* signal);
 
-  Uint32 getMinLqhWorkers();
-  void init_c_fragments_per_node();
   void execCREATE_FRAGMENTATION_REQ(Signal*);
   
   void waitDropTabWritingToFile(Signal *, TabRecordPtr tabPtr);

=== modified file 'storage/ndb/test/src/CpcClient.cpp'
--- a/storage/ndb/test/src/CpcClient.cpp	revid:mikael.ronstrom@stripped
+++ b/storage/ndb/test/src/CpcClient.cpp	revid:mikael.ronstrom@stripped
@@ -424,7 +424,7 @@ SimpleCpcClient::cpc_send(const char *cm
 			  const Properties &args) {
   SocketOutputStream cpc_out(cpc_sock);
 
-  cpc_out.println("%s", cmd);
+  cpc_out.println(cmd);
 
   Properties::Iterator iter(&args);
   const char *name;

No bundle (reason: useless for push emails).