From: Mikael Ronstrom
Date: September 19 2012 8:31am
Subject: bzr push into mysql-5.5-cluster-7.2 branch (mikael.ronstrom:3977 to 3979)
List-Archive: http://lists.mysql.com/commits/144811
Message-Id: <201209190832.q8J8WnGh014069@dator6>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3979 Mikael Ronstrom	2012-09-18
      Remove debug parts and comments no longer in use

    modified:
      storage/ndb/src/kernel/blocks/suma/Suma.cpp
      storage/ndb/src/ndbapi/ClusterMgr.cpp
      storage/ndb/src/ndbapi/TransporterFacade.cpp
      storage/ndb/src/ndbapi/TransporterFacade.hpp
 3978 Mikael Ronstrom	2012-09-18
      Fix a bug where signals can be stored in local thread buffer up to 30 seconds or more before being sent

    modified:
      mysql-test/suite/ndb/r/ndb_basic.result
      storage/ndb/src/kernel/blocks/suma/Suma.cpp
      storage/ndb/src/ndbapi/ClusterMgr.cpp
      storage/ndb/src/ndbapi/TransporterFacade.cpp
      storage/ndb/src/ndbapi/TransporterFacade.hpp
      storage/ndb/src/ndbapi/trp_client.cpp
 3977 Mikael Ronstrom	2012-09-17
      Remove erroneus #ifdef

    modified:
      storage/ndb/src/common/portlib/NdbThread.c
=== modified file 'mysql-test/suite/ndb/r/ndb_basic.result'
--- a/mysql-test/suite/ndb/r/ndb_basic.result	revid:mikael.ronstrom@stripped
+++ b/mysql-test/suite/ndb/r/ndb_basic.result	revid:mikael.ronstrom@stripped
@@ -129,7 +129,6 @@ ndb_log_update_as_write	#
 ndb_log_updated_only	#
 ndb_mgmd_host	#
 ndb_nodeid	#
-ndb_num_recv_threads	#
 ndb_optimization_delay	#
 ndb_optimized_node_selection	#
 ndb_recv_thread_activation_threshold	#

=== modified file 'storage/ndb/src/kernel/blocks/suma/Suma.cpp'
--- a/storage/ndb/src/kernel/blocks/suma/Suma.cpp	revid:mikael.ronstrom@stripped
+++ b/storage/ndb/src/kernel/blocks/suma/Suma.cpp	revid:mikael.ronstrom@stripped
@@ -5208,7 +5208,7 @@ Suma::execSUB_GCP_COMPLETE_ACK(Signal* s
     return;
   }
 
-  
+
   jam();
   Ptr<Gcp_record> gcp;
   for(c_gcp_list.first(gcp); !gcp.isNull(); c_gcp_list.next(gcp))

=== modified file 'storage/ndb/src/ndbapi/trp_client.cpp'
--- a/storage/ndb/src/ndbapi/trp_client.cpp	revid:mikael.ronstrom@stripped
+++ b/storage/ndb/src/ndbapi/trp_client.cpp	revid:mikael.ronstrom@stripped
@@ -363,6 +363,11 @@ int PollGuard::wait_for_input_in_loop(in
       ret_val= -1;
       break;
     }
+    /**
+     * Ensure any signals sent by receivers are sent by send thread
+     * eventually by flushing buffers to global area.
+     */
+    m_clnt->flush_send_buffers();
   } while (1);
 #ifdef VM_TRACE
   ndbout << "ERR: receiveResponse - theImpl->theWaiter.m_state = ";

No bundle (reason: useless for push emails).