bzr commit into mysql-5.1-telco-6.2 branch (frazer:3005) Bug#45754

[Frazer Clement]

#At file:///home/frazer/bzr/mysql-5.1-telco-6.2/

 3005 Frazer Clement	2009-09-24
      Bug#45754 MySQL Cluster : Internal blob read buffer size calculation incorrect on scans.  Ensure that required blob buffer size is reset for each row in scan
      modified:
        sql/ha_ndbcluster.cc

=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc	2009-09-24 14:22:10 +0000
+++ b/sql/ha_ndbcluster.cc	2009-09-24 14:32:40 +0000
@@ -694,6 +694,9 @@ int g_get_ndb_blobs_value(NdbBlob *ndb_b
   DBUG_ENTER("g_get_ndb_blobs_value");
   DBUG_PRINT("info", ("destination row: %p", ha->m_blob_destination_record));
 
+  if (ha->m_blob_counter == 0)   /* Reset total size at start of row */
+    ha->m_blobs_row_total_size= 0;
+
   /* Count the total length needed for blob data. */
   int isNull;
   if (ndb_blob->getNull(isNull) != 0)
@@ -709,11 +712,15 @@ int g_get_ndb_blobs_value(NdbBlob *ndb_b
       DBUG_ASSERT(FALSE);
       DBUG_RETURN(-1);
     }
+    DBUG_PRINT("info", ("Blob number %d needs size %llu, total buffer reqt. now %llu",
+                        ha->m_blob_counter,
+                        len64,
+                        ha->m_blobs_row_total_size));
   }
   ha->m_blob_counter++;
 
   /*
-    Wait until all blobs are active with reading, so we can allocate
+    Wait until all blobs in this row are active, so we can allocate
     and use a common buffer containing all.
   */
   if (ha->m_blob_counter < ha->m_blob_expected_count_per_row)