From: Jonas Oreland
Date: February 16 2012 4:51pm
Subject: bzr push into mysql-5.1-telco-7.0 branch (jonas.oreland:4860 to 4861)
 Bug#13618181
List-Archive: http://lists.mysql.com/commits/142929
X-Bug: 13618181
Message-Id: <20120217084013.492CD55C272@perch.localdomain>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4861 Jonas Oreland	2012-02-16
      ndb - bug#13618181 - patch 3 - pack send buffers also when getting full fifo for a particular node (from a particular thread)

    modified:
      storage/ndb/src/kernel/vm/mt.cpp
 4860 mikael.ronstrom@stripped	2012-02-14
      ndb - fix for flexAsynch

    modified:
      storage/ndb/test/ndbapi/flexAsynch.cpp
=== modified file 'storage/ndb/src/kernel/vm/mt.cpp'
--- a/storage/ndb/src/kernel/vm/mt.cpp	2012-02-02 11:01:13 +0000
+++ b/storage/ndb/src/kernel/vm/mt.cpp	2012-02-16 16:50:50 +0000
@@ -2657,6 +2657,41 @@ register_pending_send(thr_data *selfptr,
   }
 }
 
+static void try_send(thr_data *, Uint32); // prototype
+
+/**
+ * pack send buffers for a specific node
+ */
+void
+pack_send_buffer(thr_data *selfptr, Uint32 node)
+{
+  thr_repository* rep = &g_thr_repository;
+  thr_repository::send_buffer* sb = rep->m_send_buffers+node;
+  thread_local_pool<thr_send_page>* pool = &selfptr->m_send_buffer_pool;
+
+  lock(&sb->m_send_lock);
+  int bytes = link_thread_send_buffers(sb, node);
+  if (bytes)
+  {
+    pack_sb_pages(pool, sb);
+  }
+  unlock(&sb->m_send_lock);
+
+  /**
+   * release buffers prior to checking m_force_send
+   */
+  pool->release_global(rep->m_mm, RG_TRANSPORTER_BUFFERS);
+
+  /**
+   * After having locked/unlock m_send_lock
+   *   "protocol" dictates that we must check the m_force_send
+   */
+  if (sb->m_force_send)
+  {
+    try_send(selfptr, node);
+  }
+}
+
 /**
  * publish thread-locally prepared send-buffer
  */
@@ -2683,9 +2718,7 @@ flush_send_buffer(thr_data* selfptr, Uin
 
   if (unlikely(next == ri))
   {
-    lock(&sb->m_send_lock);
-    link_thread_send_buffers(sb, node);
-    unlock(&sb->m_send_lock);
+    pack_send_buffer(selfptr, node);
   }
 
   dst->m_buffers[wi] = src->m_first_page;

No bundle (reason: useless for push emails).