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

[Ole John Aske]

 3443 Ole John Aske	2011-02-28
      A few query plans changed as result of merge from main telco containing 'greedy optimizer patches'.
      Added 'straight_join' to these testcases to make then produce the original query plan.
      (Which is critical for having the test to test what it was supposed to test)

    modified:
      mysql-test/suite/ndb/t/ndb_join_pushdown.test
 3442 Jan Wedvik	2011-02-24
      This commit reduces the number of malloc/free calls when using linked 
      operations. For each NdbQueryImpl instance, memory for all needed instances of a given 
      type is allocated at once whenever possible, instead of allocating for one or a 
      few instances at a time.

    modified:
      storage/ndb/src/ndbapi/NdbQueryOperation.cpp
      storage/ndb/src/ndbapi/NdbQueryOperationImpl.hpp
=== modified file 'mysql-test/suite/ndb/t/ndb_join_pushdown.test'
--- a/mysql-test/suite/ndb/t/ndb_join_pushdown.test	2011-02-14 10:50:42 +0000
+++ b/mysql-test/suite/ndb/t/ndb_join_pushdown.test	2011-02-28 11:46:27 +0000
@@ -59,11 +59,11 @@ join t1 as t2 on t2.a = t1.b and t2.b = 
 # Check that we do not push an operation if this prevents us from using
 # 'join buffer'.
 explain extended 
-select count(*) 
+select straight_join count(*) 
 from t1 as x1 
 join t1 as x2 on x1.d > x2.a + 1000 
 join t1 as x3 on x1.c=x3.a and x1.d=x3.b;
-select count(*) 
+select straight_join count(*) 
 from t1 as x1 
 join t1 as x2 on x1.d > x2.a + 1000 
 join t1 as x3 on x1.c=x3.a and x1.d=x3.b;
@@ -2726,10 +2726,10 @@ update t1 set b=b-10;
 update t1 set u=u+100;
 
 set ndb_join_pushdown=on;
-explain extended select count(*) from 
+explain extended select straight_join count(*) from 
   (t1 as x join t1 as y on y.b = x.a)
  left outer join t1 as z on z.u = x.a;
-select count(*) from 
+select straight_join count(*) from 
   (t1 as x join t1 as y on y.b = x.a)
  left outer join t1 as z on z.u = x.a;
 

No bundle (reason: useless for push emails).