Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1


mysql-test/r/ndb_condition_pushdown.result:
  Auto merged
mysql-test/t/ndb_condition_pushdown.test:
  Auto merged

mysql-test/r/ndb_condition_pushdown.result

@@ -1783,10 +1783,10 @@ a	b
 1	jonas
 3	johan
 set engine_condition_pushdown = off;
-select auto from t1 where date_time like '1902-02-02 %';
+select auto from t1 where date_time like '1902-02-02 %' order by auto;
 auto
 2
-select auto from t1 where date_time not like '1902-02-02 %';
+select auto from t1 where date_time not like '1902-02-02 %' order by auto;
 auto
 3
 4
@@ -1794,13 +1794,13 @@ set engine_condition_pushdown = on;
 explain select auto from t1 where date_time like '1902-02-02 %';
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	3	Using where
-select auto from t1 where date_time like '1902-02-02 %';
+select auto from t1 where date_time like '1902-02-02 %' order by auto;
 auto
 2
 explain select auto from t1 where date_time not like '1902-02-02 %';
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	3	Using where
-select auto from t1 where date_time not like '1902-02-02 %';
+select auto from t1 where date_time not like '1902-02-02 %' order by auto;
 auto
 3
 4

mysql-test/t/ndb_condition_pushdown.test

@@ -1651,13 +1651,13 @@ select * from t5 where b like '%jo%' order by a;
 
 # bug#21056  	ndb pushdown equal/setValue error on datetime
 set engine_condition_pushdown = off;
-select auto from t1 where date_time like '1902-02-02 %';
-select auto from t1 where date_time not like '1902-02-02 %';
+select auto from t1 where date_time like '1902-02-02 %' order by auto;
+select auto from t1 where date_time not like '1902-02-02 %' order by auto;
 set engine_condition_pushdown = on;
 explain select auto from t1 where date_time like '1902-02-02 %';
-select auto from t1 where date_time like '1902-02-02 %';
+select auto from t1 where date_time like '1902-02-02 %' order by auto;
 explain select auto from t1 where date_time not like '1902-02-02 %';
-select auto from t1 where date_time not like '1902-02-02 %';
+select auto from t1 where date_time not like '1902-02-02 %' order by auto;
 
 # bug#17421 -1
 drop table t1;