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

[Ole John Aske]

 3393 Ole John Aske	2010-12-08
      SPJ-scan-scan: Adding a missing '--sorted_result' spec to ndb_condition_pushdown.test.

    modified:
      mysql-test/suite/ndb/r/ndb_condition_pushdown.result
      mysql-test/suite/ndb/t/ndb_condition_pushdown.test
 3392 Ole John Aske	2010-12-07
      SPJ-scan-scan: Cherry picked fix for bug#58791: Incorrect result as Cluster may fail to reject an unpushable condition.

    modified:
      mysql-test/suite/ndb/r/ndb_condition_pushdown.result
      mysql-test/suite/ndb/t/ndb_condition_pushdown.test
      sql/ha_ndbcluster.cc
=== modified file 'mysql-test/suite/ndb/r/ndb_condition_pushdown.result'
--- a/mysql-test/suite/ndb/r/ndb_condition_pushdown.result	2010-12-07 17:27:02 +0000
+++ b/mysql-test/suite/ndb/r/ndb_condition_pushdown.result	2010-12-08 07:58:31 +0000
@@ -2294,9 +2294,9 @@ where table2.pk1 in (0,3) and
 (table1.pk1 = 7 or table2.pk1 = 3);
 pk1	pk1	pk2	pk2
 1	3	0	0
-4	3	0	0
-3	3	0	0
 2	3	0	0
+3	3	0	0
+4	3	0	0
 drop table t;
 set engine_condition_pushdown = @old_ecpd;
 DROP TABLE t1,t2,t3,t4,t5;

=== modified file 'mysql-test/suite/ndb/t/ndb_condition_pushdown.test'
--- a/mysql-test/suite/ndb/t/ndb_condition_pushdown.test	2010-12-07 17:27:02 +0000
+++ b/mysql-test/suite/ndb/t/ndb_condition_pushdown.test	2010-12-08 07:58:31 +0000
@@ -2358,6 +2358,8 @@ set engine_condition_pushdown=1;
 # '(table1.pk1 = 7 or table2.pk1 = 3)' as a pushable cond.
 # for 'table2'
 #
+
+--sorted_result
 select table1.pk1, table2.pk1, table1.pk2, table2.pk2
  from t as table1, t as table2
  where table2.pk1 in (0,3) and

No bundle (reason: useless for push emails).