bzr push into mysql-5.1-telco-7.0-spj-scan-vs-scan branch (jonas.oreland:3569 to 3571)

[Jonas Oreland]

 3571 Jonas Oreland	2011-10-03
      ndb - annotate spj mrr tests with execute count

    modified:
      mysql-test/suite/ndb/r/ndb_join_pushdown.result
      mysql-test/suite/ndb/t/ndb_join_pushdown.test
 3570 Jonas Oreland	2011-10-03
      ndb - update copyright header to ORA in abstract query plan

    modified:
      sql/abstract_query_plan.cc
      sql/abstract_query_plan.h
 3569 Jan Wedvik	2011-09-29
      Adding regression test for the following commit:
      
      "4562 Jan Wedvik 2011-09-29
      This patch will make the SPJ block fetch all rows for some non-root index scans
      in one batch rather than two.
      This will happen if the first batch reads from a subset of the fragments and
      receive few rows. The SPJ block will then
      try to read from the remaining fragments before finishing the batch.
      This is especially useful when doing bushy scans. If there are more branches in
      the bushy scan, then these will have to be
      repeated for each batch of the current scan."

    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-09-29 13:11:52 +0000
+++ b/mysql-test/suite/ndb/r/ndb_join_pushdown.result	2011-10-03 09:41:51 +0000
@@ -2113,6 +2113,9 @@ and t2.a = t1.b;
 a	b	a	b
 1	2	2	3
 3	1	1	2
+@ndb_execute_count:=VARIABLE_VALUE-@ndb_init_execute_count
+3
+This should yield 3 executes (for now...buh)
 drop table t1;
 create table t1 (a int, b int, primary key(a)) engine = ndb;
 insert into t1 values (1, 2);
@@ -2136,6 +2139,9 @@ and t2.a = t1.b;
 a	b	a	b
 1	2	2	3
 3	1	1	2
+@ndb_execute_count:=VARIABLE_VALUE-@ndb_init_execute_count
+1
+This should yield 1 execute (but inefficient since it's based on scan)
 explain extended
 select *
 from t1, t1 as t2

=== modified file 'mysql-test/suite/ndb/t/ndb_join_pushdown.test'
--- a/mysql-test/suite/ndb/t/ndb_join_pushdown.test	2011-09-29 13:11:52 +0000
+++ b/mysql-test/suite/ndb/t/ndb_join_pushdown.test	2011-10-03 09:41:51 +0000
@@ -1075,11 +1075,14 @@ select *
 from t1, t1 as t2
 where t1.a in (1,3,5)
   and t2.a = t1.b;
+--source suite/ndb/include/ndb_init_execute_count.inc
 --sorted_result
 select *
 from t1, t1 as t2
 where t1.a in (1,3,5)
   and t2.a = t1.b;
+--source suite/ndb/include/ndb_execute_count.inc
+--echo This should yield 3 executes (for now...buh)
 
 connection ddl;
 drop table t1;
@@ -1100,11 +1103,14 @@ select *
 from t1, t1 as t2
 where t1.a in (1,3,5)
   and t2.a = t1.b;
+--source suite/ndb/include/ndb_init_execute_count.inc
 --sorted_result
 select *
 from t1, t1 as t2
 where t1.a in (1,3,5)
   and t2.a = t1.b;
+--source suite/ndb/include/ndb_execute_count.inc
+--echo This should yield 1 execute (but inefficient since it's based on scan)
 
 
 ## Adding and 'order by ... desc' trigger the usage

=== modified file 'sql/abstract_query_plan.cc'
--- a/sql/abstract_query_plan.cc	2011-09-28 06:57:21 +0000
+++ b/sql/abstract_query_plan.cc	2011-10-03 09:27:06 +0000
@@ -1,6 +1,5 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
-    All rights reserved. Use is subject to license terms.
+   Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/abstract_query_plan.h'
--- a/sql/abstract_query_plan.h	2011-09-27 13:33:51 +0000
+++ b/sql/abstract_query_plan.h	2011-10-03 09:27:06 +0000
@@ -1,6 +1,5 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
-    All rights reserved. Use is subject to license terms.
+   Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

No bundle (reason: useless for push emails).