List:Commits« Previous MessageNext Message »
From:jonas oreland Date:May 27 2011 6:15am
Subject:bzr commit into mysql-5.1-telco-7.0 branch (jonas:4425)
View as plain text  
#At file:///home/jonas/src/telco-7.0/ based on revid:jan.wedvik@stripped

 4425 jonas oreland	2011-05-27
      ndb - fix bug with batch size increase/decrease

    modified:
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
=== modified file 'storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2011-05-25 14:31:47 +0000
+++ b/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2011-05-27 06:15:17 +0000
@@ -10131,7 +10131,11 @@ Dblqh::seize_acc_ptr_list(ScanRecord* sc
   Uint32 segments= (new_batch_size + (SectionSegment::DataLength -2 )) / 
     SectionSegment::DataLength;
 
-  ndbassert(segments >= scanP->scan_acc_segments);
+  if (segments <= scanP->scan_acc_segments)
+  {
+    // No need to allocate more segments.
+    return true;
+  }
 
   if (new_batch_size > 1)
   {


Attachment: [text/bzr-bundle] bzr/jonas@mysql.com-20110527061517-2dm1u3lrnygvxqnc.bundle
Thread
bzr commit into mysql-5.1-telco-7.0 branch (jonas:4425) jonas oreland27 May