List:Commits« Previous MessageNext Message »
From:Jonas Oreland Date:November 25 2008 6:46pm
Subject:bzr push into mysql-5.1 branch (jonas:3128 to 3129)
View as plain text  
 3129 Jonas Oreland	2008-11-25
      ndb - fix bug in send-buffer rewrite causing (rarely) entire signals to get lost
modified:
  storage/ndb/src/common/transporter/TransporterRegistry.cpp

 3128 Jonas Oreland	2008-11-23
      ndb - fix half-backed backport of my_vsnprintf from 6.0 causing main.type_blob to
fail
modified:
  strings/longlong2str.c
  strings/my_vsnprintf.c

=== modified file 'storage/ndb/src/common/transporter/TransporterRegistry.cpp'
--- a/storage/ndb/src/common/transporter/TransporterRegistry.cpp	2008-11-12 08:26:18 +0000
+++ b/storage/ndb/src/common/transporter/TransporterRegistry.cpp	2008-11-25 17:02:56 +0000
@@ -1978,18 +1978,18 @@ TransporterRegistry::bytes_sent(NodeId n
     release_page(tmp);
   }
 
-  if (bytes)
+  if (used_bytes == 0)
+  {
+    b->m_first_page = 0;
+    b->m_last_page = 0;
+  }
+  else
   {
     page->m_start += bytes;
     page->m_bytes -= bytes;
     assert(page->m_start + page->m_bytes <= page->max_data_bytes());
     b->m_first_page = page;
   }
-  else
-  {
-    b->m_first_page = 0;
-    b->m_last_page = 0;
-  }
 
   return used_bytes;
 }

Thread
bzr push into mysql-5.1 branch (jonas:3128 to 3129) Jonas Oreland25 Nov