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

--===============2807265731952891726==
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:ole.john.aske@stripped

 3429 Ole John Aske	2011-02-10
      spj-scan-scan: Fixed some more incorrect 'size' spec when using Bitmask<size>.

    modified:
      storage/ndb/src/ndbapi/NdbQueryBuilder.cpp
      storage/ndb/src/ndbapi/NdbQueryBuilderImpl.hpp
=== modified file 'storage/ndb/src/ndbapi/NdbQueryBuilder.cpp'
--- a/storage/ndb/src/ndbapi/NdbQueryBuilder.cpp	2011-02-04 08:45:18 +0000
+++ b/storage/ndb/src/ndbapi/NdbQueryBuilder.cpp	2011-02-10 11:54:23 +0000
@@ -332,7 +332,7 @@ NdbQueryDef::destroy() const
 void
 NdbQueryDef::print() const
 {
-  m_impl.getQueryOperation(0U).printTree(0, Bitmask<NDB_SPJ_MAX_TREE_NODES>());
+  m_impl.getQueryOperation(0U).printTree(0, Bitmask<(NDB_SPJ_MAX_TREE_NODES+31)/32>());
 }
 
 /*************************************************************************
@@ -1137,7 +1137,7 @@ NdbQueryBuilderImpl::prepare()
   if (doPrintQueryTree)
   {
     ndbout << "Query tree:" << endl;
-    def->getQueryOperation(0U).printTree(0, Bitmask<NDB_SPJ_MAX_TREE_NODES>());
+    def->getQueryOperation(0U).printTree(0, Bitmask<(NDB_SPJ_MAX_TREE_NODES+31)/32>());
   }
 
   return def;
@@ -2102,7 +2102,7 @@ NdbQueryOperationDefImpl::appendChildPro
  * that connect the tree nodes.
  */
 static void printMargin(Uint32 depth, 
-                        Bitmask<NDB_SPJ_MAX_TREE_NODES> hasMoreSiblingsMask, 
+                        Bitmask<(NDB_SPJ_MAX_TREE_NODES+31)/32> hasMoreSiblingsMask, 
                         bool header)
 {
   if (depth > 0)
@@ -2136,11 +2136,11 @@ static void printMargin(Uint32 depth, 
 
 void 
 NdbQueryOperationDefImpl::printTree(Uint32 depth, 
-                                    Bitmask<NDB_SPJ_MAX_TREE_NODES> 
+                                    Bitmask<(NDB_SPJ_MAX_TREE_NODES+31)/32> 
                                     hasMoreSiblingsMask) const
 {
   // Print vertical line leading down to this node.
-  Bitmask<NDB_SPJ_MAX_TREE_NODES> firstLineMask = hasMoreSiblingsMask;
+  Bitmask<(NDB_SPJ_MAX_TREE_NODES+31)/32> firstLineMask = hasMoreSiblingsMask;
   firstLineMask.set(depth);
   printMargin(depth, firstLineMask, false);
   ndbout << endl;

=== modified file 'storage/ndb/src/ndbapi/NdbQueryBuilderImpl.hpp'
--- a/storage/ndb/src/ndbapi/NdbQueryBuilderImpl.hpp	2011-02-08 12:14:41 +0000
+++ b/storage/ndb/src/ndbapi/NdbQueryBuilderImpl.hpp	2011-02-10 11:54:23 +0000
@@ -432,8 +432,9 @@ public:
    * @param hasMoreSiblingsMask The n'th bit should be set if the n'th ancestor
    * (counted from the root) has more sibling nodes.
    */
-  void printTree(Uint32 depth, 
-                 Bitmask<NDB_SPJ_MAX_TREE_NODES> hasMoreSiblingsMask) const;
+  void printTree(
+           Uint32 depth, 
+           Bitmask<(NDB_SPJ_MAX_TREE_NODES+31)/32> hasMoreSiblingsMask) const;
 
 protected:
   // QueryTree building:


--===============2807265731952891726==
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\
#   s79ccdu0yhgdtpqr
# target_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\
#   /mysql-5.1-telco-7.0-spj-scan-scan/
# testament_sha1: 453e7d588f4d539ca926038e5e7aa463fd70ff30
# timestamp: 2011-02-10 12:54:27 +0100
# source_branch: bzr+ssh://oaske@stripped/bzrroot/server\
#   /mysql-5.1-telco-7.0/
# base_revision_id: ole.john.aske@stripped\
#   hq7eoq2xj1l7mjxr
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWZCTo2YAAnN/gECQBABQ7///
dzf+QL////BQBXhe0VQWyhpo2wAklKPUeEwTKPSGQxGmgA2p6jaQNpA0HMARgmIBgEwTRkNDAJgj
EwkSJoqPyMkeIIhpkNNAAAMRkBocwBGCYgGATBNGQ0MAmCMTCSRNNCeQI0mAhlME2qPRG00jQ0Bg
k1px4d0xqOnfOo2ZyrwgNc7JSe9bektxtKDlbFTluuDXa4QTQ01+bsz4GI0Ntn45xUnRknpfeeE5
TmNmF9NVVkUPp03YGo5+SmeuDPtf6Dxc9Vr2HCybT44C+m7VlidZ1E7Tu7L0SaC+14DNBzCntx4j
6mAthYJ3TMOyXWac6TUhYjGO5Lxay3MkdHABqHTDdwk8R29NdNQlvBaVwqHgthAYW8pHzgYwEzAM
T3m2fIGk5YQqApRCF1plkjJyRwB1lU8SMRNDilTIFY3dGFlZ7PmAxcK5k4uFbf3zSJyQrx45dBs6
sEKhMpjAUQwrolZdlRtmWeY46i0hkFBBp8rpFQGeMnW7thSSLDMaPudS5VdGvYgNVZeYm5yRWZDD
CCpUIrAZnwVEzyUrxaNAtpcbpxQvPmu4vprdIvQW3cM/uF3eYqzMMVZY2222jgqZ+xnkmb5BnCkP
tzKsoO4FDVEVta3XXSgFhUXpk11x1QhqKCR1UEQojjIlkcY21XkjqtmcR6ppV06RFKtr3jaPAw6L
oEyY8Yz5DMYmvCBQpll1wTB5cSoiavtcPvy1aGovx+oF8g0lp09OXUtBEqXAwMTAw6LGxNI8deOl
drzRwLtc79DiJeSCI7XXPBUk3WYFhpjWPmbzUXgZjj322XuWLacamhQVvU2B7waLQVLEOx82x6YF
7VlDllaNZmA1s5DQKriygFafcV2xEMmZtAvTZM9ji7TSK0T/0J8T4tvq+ROU/onugXuE8XQTF43H
oLwLD6CuFWKSYVC5GX9i/4URcxfUVZxrOl6X4mXxgF56jOUCj6xvh4n6cAVGZyXM85SOQ7htppSu
FKRZQnSsBMnjzjKYCVjNgOwrzVG4Wc2jGylxrUA7N4eQjfRsKi0jkYhMqN5kIxLgNPv0mgjnvZgX
v2CV/Ol6tIt5mnGWg9I1hdENQ/EghjmPA0sSP8vxWdlxW0zf0BID9sj0qW/l3wVAhUbm19b9tJLr
5WGYaQKmHew7omrSxKZ3aJlOPZ9iSzN3HxzemqzIlVhpfh6IMdVF2JhxK5GykYmiCOUDhtNRYipD
55GcNxlcZFNHgZblaoH9HaclWx4SNA7iQ2AeoDdw5F9xFdGRuFcp9XcB2IUv3WvICguFPFw1ppoY
PFDPYlQYDkIROCdIB6gvJa5qedWvL9eO2MipE7ke1Lu+sAnsOa7ZHAFUthV1sesd7R4G0ZC7TaiR
xKvWMZFd4cgsRi7xTBMXyYuBXgnB4rDZxs2RQpjcb0ulPrNcjVkoVU0qlfZzueeKpJAryCTasPAS
rFwB1dDclOveJI8crpA0Ngyx3q6NGcFBUUKQkTDmWAS42iSqcuEi1gr6V+xTqPCCycFMjZcwwPT+
JTWayggHkV8JLhMCfgW4WqpdPoWyA7A7jBl5licMFiQQcRH+Iy1fJPjWlb4YKztYtWZZ6Hv7eHxI
0AwFAHNSVeGmAU46S8KLTVaj6POM0j5MCtDfo7BpS+Fhf6YOpRSdg7rnEidJpoasgjeD2svtDy3V
7ZWjz1GpKSU1kA0WCh4HszO+4dYWefqGYlJXyVZoRz/Ig7vHX6lYeSqRnSoGB57gPHBVIj/4u5Ip
woSEhJ0bMA==


--===============2807265731952891726==--