bzr push into mysql-5.1-telco-6.3 branch (jonas:2834 to 2835)

[Jonas Oreland]

 2835 Jonas Oreland	2009-02-10 [merge]
      merge 62 to 63
modified:
  storage/ndb/include/ndbapi/NdbScanOperation.hpp
  storage/ndb/src/ndbapi/NdbScanOperation.cpp

 2834 Jonas Oreland	2009-02-10 [merge]
      merge 62 to 63
modified:
  sql/ha_ndbcluster.cc
  storage/ndb/include/ndbapi/NdbScanOperation.hpp
  storage/ndb/src/ndbapi/NdbScanOperation.cpp
  storage/ndb/src/ndbapi/ndberror.c

=== modified file 'storage/ndb/include/ndbapi/NdbScanOperation.hpp'
--- a/storage/ndb/include/ndbapi/NdbScanOperation.hpp	2009-02-10 06:53:05 +0000
+++ b/storage/ndb/include/ndbapi/NdbScanOperation.hpp	2009-02-10 09:06:59 +0000
@@ -402,8 +402,7 @@ protected:
                          Uint64 aTransId);
   int handleScanOptions(const ScanOptions *options);
   int generatePackedReadAIs(const NdbRecord *reseult_record, bool& haveBlob);
-  int scanImpl(const unsigned char* result_mask,
-               const NdbScanOperation::ScanOptions *options);
+  int scanImpl(const NdbScanOperation::ScanOptions *options);
   int scanTableImpl(const NdbRecord *result_record,
                     NdbOperation::LockMode lock_mode,
                     const unsigned char *result_mask,

=== modified file 'storage/ndb/src/ndbapi/NdbScanOperation.cpp'
--- a/storage/ndb/src/ndbapi/NdbScanOperation.cpp	2009-02-10 06:53:05 +0000
+++ b/storage/ndb/src/ndbapi/NdbScanOperation.cpp	2009-02-10 09:06:59 +0000
@@ -418,13 +418,10 @@ NdbScanOperation::generatePackedReadAIs(
  * types share
  */
 inline int
-NdbScanOperation::scanImpl(const unsigned char *result_mask,
-                           const NdbScanOperation::ScanOptions *options)
+NdbScanOperation::scanImpl(const NdbScanOperation::ScanOptions *options)
 {
   bool haveBlob= false;
 
-  m_attribute_record->copyMask(m_read_mask, result_mask);
-
   /* Add AttrInfos for packed read of cols in result_record */
   if (generatePackedReadAIs(m_attribute_record, haveBlob) != 0)
     return -1;
@@ -524,6 +521,7 @@ NdbScanOperation::scanTableImpl(const Nd
 #endif
 
   m_attribute_record= result_record;
+  m_attribute_record->copyMask(m_read_mask, result_mask);
 
   /* Process scan definition info */
   res= processTableScanDefs(lock_mode, scan_flags, parallel, batch);
@@ -531,9 +529,8 @@ NdbScanOperation::scanTableImpl(const Nd
     return -1;
 
   theStatus= NdbOperation::UseNdbRecord;
-
   /* Call generic scan code */
-  return scanImpl(result_mask, options);
+  return scanImpl(options);
 }
 
 
@@ -927,7 +924,7 @@ NdbIndexScanOperation::scanIndexImpl(con
   theStatus= NdbOperation::UseNdbRecord;
   
   /* Call generic scan code */
-  res= scanImpl(result_mask, options);
+  res= scanImpl(options);
 
   if (!res)
   {