bzr push into mysql-5.1-telco-7.0-spj-scan-vs-scan branch (ole.john.aske:3505 to 3506)

[Ole John Aske]

 3506 Ole John Aske	2011-06-16 [merge]
      (null-)merge telco-7-0 to spj branch

    modified:
      storage/ndb/src/ndbapi/NdbQueryBuilder.hpp
 3505 Jan Wedvik	2011-06-16
      This commit is a regression test case mysql-5.1-telco-7.0 revno: 4457, which was:
      
      "There was an error in the code setting the T_SCAN_REPEATABLE flag. The
        flag was set on the parent of the intended operation rather than on the 
        operation itself. This caused scan ranges for the repeatable scan to be 
        released too early. This gave wrong results when running a bushy scan where
        the scan to be repeated used pruning."

    modified:
      mysql-test/suite/ndb/r/ndb_join_pushdown.result
      mysql-test/suite/ndb/t/ndb_join_pushdown.test
=== modified file 'storage/ndb/src/ndbapi/NdbQueryBuilder.hpp'
--- a/storage/ndb/src/ndbapi/NdbQueryBuilder.hpp	2011-04-14 08:59:45 +0000
+++ b/storage/ndb/src/ndbapi/NdbQueryBuilder.hpp	2011-06-16 10:26:41 +0000
@@ -358,7 +358,7 @@ private:
  *
  * - The NdbQueryDef produced by the ::prepare() method has a lifetime 
  *   until it is explicit released by NdbQueryDef::release()
- *  
+ *
  */
 class NdbQueryBuilder 
 {

No bundle (reason: useless for push emails).