bzr push into mysql-6.0-ndb branch (tomas.ulin:2837 to 2838)

[Tomas Ulin]

 2838 Tomas Ulin	2009-02-10 [merge]
      merge
modified:
  storage/ndb/src/ndbapi/NdbScanOperation.cpp

 2837 Tomas Ulin	2009-02-09 [merge]
      merge
modified:
  storage/ndb/src/ndbapi/NdbScanOperation.cpp

=== modified file 'storage/ndb/src/ndbapi/NdbScanOperation.cpp'
--- a/storage/ndb/src/ndbapi/NdbScanOperation.cpp	2009-02-09 20:55:44 +0000
+++ b/storage/ndb/src/ndbapi/NdbScanOperation.cpp	2009-02-10 08:24:37 +0000
@@ -869,8 +869,8 @@ NdbIndexScanOperation::scanIndexImpl(con
       But cannot mask pseudo columns, nor key columns in ordered scans.
     */
     attrId= col->attrId;
-    if ( result_mask && !(attrId & AttributeHeader::PSEUDO) &&
-         !(result_mask[attrId>>3] & (1<<(attrId & 7))) )
+    if ( !(attrId & AttributeHeader::PSEUDO) &&
+         !BitmaskImpl::get(MASKSZ, m_read_mask, attrId))
     {
       continue;
     }