bk commit into 5.0 tree (mskold:1.2258) BUG#21056

[Martin Skold]

Below is the list of changes that have just been committed into a local
5.0 repository of marty. When marty does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-09-06 11:54:01+02:00, mskold@stripped +2 -0
  Bug #21056  ndb pushdown equal/setValue error on datetime: Added missing order by

  mysql-test/r/ndb_condition_pushdown.result@stripped, 2006-09-06 11:53:34+02:00,
mskold@stripped +4 -4
    Bug #21056  ndb pushdown equal/setValue error on datetime: Added missing order by

  mysql-test/t/ndb_condition_pushdown.test@stripped, 2006-09-06 11:53:34+02:00,
mskold@stripped +4 -4
    Bug #21056  ndb pushdown equal/setValue error on datetime: Added missing order by

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	mskold
# Host:	linux.site
# Root:	/windows/Linux_space/MySQL/mysql-5.0

--- 1.21/mysql-test/r/ndb_condition_pushdown.result	2006-09-06 11:54:07 +02:00
+++ 1.22/mysql-test/r/ndb_condition_pushdown.result	2006-09-06 11:54:07 +02:00
@@ -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

--- 1.19/mysql-test/t/ndb_condition_pushdown.test	2006-09-06 11:54:07 +02:00
+++ 1.20/mysql-test/t/ndb_condition_pushdown.test	2006-09-06 11:54:07 +02:00
@@ -1651,13 +1651,13 @@ select * from t5 where b like '%jo%' ord
 
 # 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;