bzr commit into mysql-5.1-telco-7.0-spj-scan-vs-scan branch (ole.john.aske:3428)

[Ole John Aske]

#At file:///net/fimafeng09/export/home/tmp/oleja/mysql/mysql-5.1-telco-7.0-spj-scan-scan/ based on revid:jonas@stripped

 3428 Ole John Aske	2011-02-10
      Fixed incorrect 'size' spec of Bitmask<size> m_hasMatchingChild. The 'size' argument
      turns out to be in #words - not #bits as prev. assumed.

    modified:
      storage/ndb/src/ndbapi/NdbQueryOperation.cpp
=== modified file 'storage/ndb/src/ndbapi/NdbQueryOperation.cpp'
--- a/storage/ndb/src/ndbapi/NdbQueryOperation.cpp	2011-02-10 08:02:41 +0000
+++ b/storage/ndb/src/ndbapi/NdbQueryOperation.cpp	2011-02-10 11:10:54 +0000
@@ -436,7 +436,7 @@ private:
     /** If the n'th bit is set, then a matching tuple for the n,th child has been seen. 
      * This information is needed when generating left join tuples for those tuples
      * that had no matching children.*/
-    Bitmask<NDB_SPJ_MAX_TREE_NODES> m_hasMatchingChild;
+    Bitmask<(NDB_SPJ_MAX_TREE_NODES+31)/32> m_hasMatchingChild;
 
     explicit TupleSet()
     {}


Attachment: [text/bzr-bundle] bzr/[e-mail]