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

[Ole John Aske]

 3575 Ole John Aske	2011-10-25
      The logic for counting 'm_pushed_queries_dropped' was duplicated in 
      ha_ndbcluster::read_multi_range_first which caused that counter to
      be incremented twice.

    modified:
      mysql-test/suite/ndb/r/ndb_join_pushdown.result
      sql/ha_ndbcluster.cc
 3574 Jan Wedvik	2011-10-20
      Added regression test cases for the commit below:
      ---------------------------------------------------
      
      This commit concerns SPJ (i.e. pushed queries).
      
      The commit fixes two errors that may happend when there is a pruned child
      scan operation:
      1. The api did not set SIP_PRUNE_PARAMS as it should.
      2. There was an error in Dbspj::parseScanIndex().  When it called 
      Dbspj::expand() to process prune keys, it used to start reading
      query parameters from after whatever parseDA() had consumed. Now it starts 
      from the beginning of the query parameters (for that operation). In other 
      words, the parameter values are only sent once, and these values are used for 
      building both the scan bounds and the prune key. 

    modified:
      mysql-test/suite/ndb/r/ndb_join_pushdown.result
      mysql-test/suite/ndb/t/ndb_join_pushdown.test
=== modified file 'mysql-test/suite/ndb/r/ndb_join_pushdown.result'
--- a/mysql-test/suite/ndb/r/ndb_join_pushdown.result	2011-10-20 12:52:58 +0000
+++ b/mysql-test/suite/ndb/r/ndb_join_pushdown.result	2011-10-25 07:45:06 +0000
@@ -5539,7 +5539,7 @@ sorted_scan_count
 pushed_queries_defined
 405
 pushed_queries_dropped
-11
+8
 pushed_queries_executed
 550
 set ndb_join_pushdown = @save_ndb_join_pushdown;

=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc	2011-10-20 12:51:03 +0000
+++ b/sql/ha_ndbcluster.cc	2011-10-25 07:45:06 +0000
@@ -14968,10 +14968,6 @@ ha_ndbcluster::read_multi_range_first(KE
     }
     else // if ((...PUSHED_ROOT && m_pushed_join->get_query_def().isScanQuery()) ||...
     {
-      if (m_pushed_join_operation == PUSHED_ROOT)
-      {
-        m_thd_ndb->m_pushed_queries_dropped++;
-      }
       if (!trans)
       {
         DBUG_ASSERT(active_index != MAX_KEY);

No bundle (reason: useless for push emails).