From: Ole John Aske
Date: February 10 2011 11:10am
Subject: bzr commit into mysql-5.1-telco-7.0-spj-scan-vs-scan branch
 (ole.john.aske:3428)
List-Archive: http://lists.mysql.com/commits/131010
Message-Id: <20110210111059.80B11223@fimafeng09.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5316027178948045428=="

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

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


--===============5316027178948045428==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/ole.john.aske@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: ole.john.aske@stripped\
#   hq7eoq2xj1l7mjxr
# target_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\
#   /mysql-5.1-telco-7.0-spj-scan-scan/
# testament_sha1: 0d646f10fb71261a972f442c2a042866b3268248
# timestamp: 2011-02-10 12:10:59 +0100
# source_branch: bzr+ssh://oaske@stripped/bzrroot/server\
#   /mysql-5.1-telco-7.0/
# base_revision_id: jonas@stripped
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWeBEWyEAAX3fgEAQWOv//38T
/EC////wUAPae7qk523XTvT17hJJTBMI00E2jJoo2U/KgabUeRPU9TxT1AEokE2p6YhpqJkniZRg
AAgwjQMGSaAQAQBqMU9T1D1PUAYg0NDTQZShpoyaeo0NqaYgDQDTQZAAAElE01TaZpNI8jFAaPSA
0PU0Gg0ABmOvSn3u/Iw0KdNumoAJQ1XtY3wqKs/HYyfhf2bERBD7GDYWLE5nX4PV1eiV2Z7n/Xcj
QYtdEel5zErFFB2644q7RzCpJxi1tMfpepJTsIqwU3CsUNGwl69n681cDfuKN+SJKAVJNWBqWfar
jhG4UMzWhaQzviEOQFkzRXHxbIk4VCSGRPai2oeUVLM+dwkWdTsNshDrcAaCeuAIaCgKtct8L/iF
DEnmjgeQrlsrEn55W5ArHEA2hBmh5mL6SVuSjRQwmt16hncL/AOzti7nsMbN8Fz4SNmYmJtRY7QO
o5R4S0aJ6p5AIOJc4WCvoa6qfOpdgGo9qSNULhLMH501RTVZpF4lxvgNeLTTUW2szPTCwbVNrLiW
JvK0KbxsbAe9JkKyzWJVWJpLY5srcql5DK9pw3xclMBGYsEheaFMhbTMN3BrIkU2XzR1pDBUkFKQ
RwiBCKU9XsFjNtwofyQceDqcugCk/WllSBAnb3b3+5+OcPWKK3pf74Dk7HLDv+239SxEn57PW96T
JXY5Hnk+rxhua8Gy48z/e/0+iU3zrqwvo40YqHmxcJUaCEMZlN6Tzi4ZhVkldNJOXuLChj3JhN07
Hu8yYFoCVxEXm7RYaTLCr3Dxb88shuOlUJbtJGMGHA0uZdjbZRItPq1LESedfNwXxuNRioNhppk9
fZwwmq+OSVXHlwgyXtc9BPJtaZLwu2My6CF9BOe972vODbgacV36JnBRbDWuT2YThWORUcJgR8Ic
awN4qyQjRAnWQqadikiHdPbblY3Gy8ZxRYalMHYaZMh9jzZA9RXjFQq8pTOY3zpkcxRVaMTipXIm
fOOfI9miTLUHkaKs6/kAe7PuFlWs2pYQjFXIRiKQv+Xjb0RrCEJ3XCZQtqObSpTJON2jHG+IytYa
R5jGAzzGfEGXvg8+IEBvgIPUlgNKAcGvI1j9dqtfMNuhUUDOQUHFWVoM9fjmJ0pCQixkYALRK4DL
KghIOgmwjyuM9jT0zYtcNg4NvRCoV43JqXpKXXOfwuEwesGZHMekVIXlweAXKXrmfAiqfGkNlvka
8Vk2x7AES+vFqIyO0r3Rki0q/UH+GbHHoqJakN2LtiDY2K8KrWXX64Z26lZqEVDJW1jk6iVIU5g+
ZFACvYWa8PLmO4ZpNDKMVWouU6iDzxBKKXlFGsYN4mnGirnWowo5FJ/F3JFOFCQ4ERbIQA==


--===============5316027178948045428==--