From: jonas oreland
Date: May 27 2011 6:15am
Subject: bzr commit into mysql-5.1-telco-7.0 branch (jonas:4425)
List-Archive: http://lists.mysql.com/commits/138276
Message-Id: <20110527061522.CD9BA5181F8@eel.localdomain>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5274642986297256042=="

--===============5274642986297256042==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#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)
   {


--===============5274642986297256042==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/jonas@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: jonas@stripped
# target_branch: file:///home/jonas/src/telco-7.0/
# testament_sha1: 66e298b0270c3f8d63db5a4c0844587d25fa092d
# timestamp: 2011-05-27 08:15:22 +0200
# source_branch: file:///home/jonas/src/telco-6.3/
# base_revision_id: jan.wedvik@stripped\
#   dze5mtwno27sdkyh
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWdaCghIAAXbfgEAQUGP//1YD
QAC////6UAO3bm73ZeCvedd3dhKQkzQmaTTTaajNKeqenqNJ6m0gYjA0KT9I01T9omUnlPTUADQA
ADQSRAjU9EamGqHqe0p6hoPRAaNDTDJTT0mk2lHmmlM0T1NHqB6TR6mQ9QaYSSTTQE2qPSbUzU9G
kaaM1AAAIIZbj8+kd0q7ppLZUb9iTAC5JjktltASELO3bjhMzMcIDOVyCi+9qsXPftuy/ssOPLTO
ojPR+MOKvYJrfjQIx++UYZ1otSDSyde2c9xBomBv/jLYmxLcpIYObarDAPdEoF6+7dKNXz98hc27
kJw6GIw4jEXa9CJfxHUVCvHhOs/lWhgW1Oun0dXCG3GHSwjFQjCttdYq+VjxXGG4yRowpc0Ftbga
p465VDglCPexRYwYAsvFSAjVrigUEOcmiBiKh4LSS0Wl1VG3lzFgYjp2foKD48IoJxMXxJAimkZy
aeFvAeON9hhjfZbPjmMxF4qDR8hHNV8tUKhEx3beJtWvWrCchyg5woXlnT1WXEapYcxgsJpMEytV
+gtfFmccVkeorxoIjMMHCRf2MJWhtl4dFzSCEHk7MuC/KiikId5pdWlbibW6OaOoTpERqMmg0i4K
XDY7O8bw61ke3Ys/n8NOqV+awqDHjOzN1RChdEsFISTMkOLAve6C48T5+OveDrDQ3SIf+BrfNd8p
eNfdq5BoDjaYTria0r6QIM3KG8yTvw2fCidrjQFJR4GQoXWrkedVjr84/irJWRGZVKw7ZqRDgpPs
NipR03vueVencTp1uU1GYUtTEkKCPM7HW/K7p4FwaCaFlmNBBJK0x6ZzsClXHF3AuXjQlUxyuNdJ
fGbnuUt1SMMjllPwWzfDTf21m5yIqV9JMfxiNtmt8m+6dOtuTT29u7No1CVFs3k8SwXa8lMj01+5
48FnkkcCgrEWjzAGzZwTSgkS4DBoeih1RScW0XCvwxKNsmDjAyiWBbAK/zn5ZM4Uhu2VvNsy7yBL
JkeYzqtF5irkO0BqS1BEIuSmgDDXZ21w3o4idkIrE3Aip6+KtsNN3PldM9XuR5JX2vdUT1ZxsSrg
cBRmzBqznO+XSmtbrRSsJlAWzq/sNC0kJAUwXAZPLgoC62tdj03vYkuaTPUpGEvnK5M/KavZaFKJ
/RIPCJUBy0ua4VAjiM+jviH7etxjLWDqbZsWZUKUoEJ3SVPym1+pcN+FOxZw9gRexo3Xq3elLEqi
2bMaHZAeNbGeM9/OhOgKQcyeymq5keIrYY40xlNVSkMB6qDaK/0XJnJzZDHIHQYHtp6QajaS/QpS
RHUjmLuSKcKEhrQUEJA=


--===============5274642986297256042==--