bk commit into 5.0 tree (timour:1.2245)

[timour]

Below is the list of changes that have just been committed into a local
5.0 repository of timka. When timka 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-08-23 16:11:46+03:00, timour@stripped +2 -0
  Merge lamia.home:/home/timka/mysql/src/4.1-bug-21456
  into  lamia.home:/home/timka/mysql/src/5.0-bug-21456
  MERGE: 1.1616.2144.181

  mysql-test/r/distinct.result@stripped, 2006-08-23 16:11:44+03:00, timour@stripped +10 -11
    merge BUG#21456 test
    MERGE: 1.27.1.7

  mysql-test/t/distinct.test@stripped, 2006-08-23 16:11:44+03:00, timour@stripped +11 -11
    merge BUG#21456 test
    MERGE: 1.14.1.5

# 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:	timour
# Host:	lamia.home
# Root:	/home/timka/mysql/src/5.0-bug-21456/RESYNC

--- 1.46/mysql-test/r/distinct.result	2006-08-23 16:11:49 +03:00
+++ 1.47/mysql-test/r/distinct.result	2006-08-23 16:11:49 +03:00
@@ -595,4 +595,14 @@ id	select_type	table	type	possible_keys	
 1	SIMPLE	t1	index	NULL	PRIMARY	8	NULL	16	Using where; Using index
 SELECT DISTINCT a,a FROM t1 WHERE b < 12 ORDER BY a;
 a	a
+CREATE TABLE t1 (a int primary key, b int);
+INSERT INTO t1 (a,b) values (1,1), (2,3), (3,2);
+explain SELECT DISTINCT a, b FROM t1 ORDER BY b;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	3	Using filesort
+SELECT DISTINCT a, b FROM t1 ORDER BY b;
+a	b
+1	1
+3	2
+2	3
 DROP TABLE t1;

--- 1.24/mysql-test/t/distinct.test	2006-08-23 16:11:49 +03:00
+++ 1.25/mysql-test/t/distinct.test	2006-08-23 16:11:49 +03:00
@@ -385,6 +385,17 @@ insert into t1 values (1, "line number o
 select distinct id, IFNULL(dsc, '-') from t1;
 drop table t1;
 
+#
+# Bug 21456: SELECT DISTINCT(x) produces incorrect results when using order by
+#
+CREATE TABLE t1 (a int primary key, b int);
+
+INSERT INTO t1 (a,b) values (1,1), (2,3), (3,2);
+
+explain SELECT DISTINCT a, b FROM t1 ORDER BY b;
+SELECT DISTINCT a, b FROM t1 ORDER BY b;
+DROP TABLE t1;
+
 # End of 4.1 tests