bk commit into 5.0 tree (gkodinov:1.2255) BUG#21302

[kgeorge]

Below is the list of changes that have just been committed into a local
5.0 repository of kgeorge. When kgeorge 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-15 13:01:04+03:00, gkodinov@rakia.(none) +2 -0
  Bug #21302: Result not properly sorted when using an ORDER BY 
              on a second table in a join
  - undeterministic output of the test case removed.

  mysql-test/r/order_by.result@stripped, 2006-08-15 13:01:02+03:00, gkodinov@rakia.(none) +7
-7
    Bug #21302: Result not properly sorted when using an ORDER BY 
                on a second table in a join
    - undeterministic output of the test case removed.

  mysql-test/t/order_by.test@stripped, 2006-08-15 13:01:02+03:00, gkodinov@rakia.(none) +1 -1
    Bug #21302: Result not properly sorted when using an ORDER BY 
                on a second table in a join
    - undeterministic output of the test case removed.

# 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:	gkodinov
# Host:	rakia.(none)
# Root:	/home/kgeorge/mysql/autopush/B21159-5.0-opt

--- 1.53/mysql-test/r/order_by.result	2006-08-15 13:01:10 +03:00
+++ 1.54/mysql-test/r/order_by.result	2006-08-15 13:01:10 +03:00
@@ -882,12 +882,12 @@ INSERT INTO t3 SELECT * from t1;
 CREATE TABLE t4 LIKE t1;
 INSERT INTO t4 SELECT * from t1;
 INSERT INTO t1 values (0,0),(4,4);
-SELECT t1.*,t2.* FROM t1 LEFT JOIN (t2, t3 LEFT JOIN t4 ON t3.a=t4.a)
+SELECT t2.b FROM t1 LEFT JOIN (t2, t3 LEFT JOIN t4 ON t3.a=t4.a)
 ON (t1.a=t2.a AND t1.b=t3.b) order by t2.b;
-a	b	a	b
-0	0	NULL	NULL
-4	4	NULL	NULL
-1	1	1	1
-2	2	2	2
-3	3	3	3
+b
+NULL
+NULL
+1
+2
+3
 DROP TABLE t1,t2,t3,t4;

--- 1.37/mysql-test/t/order_by.test	2006-08-15 13:01:10 +03:00
+++ 1.38/mysql-test/t/order_by.test	2006-08-15 13:01:10 +03:00
@@ -606,7 +606,7 @@ CREATE TABLE t4 LIKE t1;
 INSERT INTO t4 SELECT * from t1;
 INSERT INTO t1 values (0,0),(4,4);
 
-SELECT t1.*,t2.* FROM t1 LEFT JOIN (t2, t3 LEFT JOIN t4 ON t3.a=t4.a)
+SELECT t2.b FROM t1 LEFT JOIN (t2, t3 LEFT JOIN t4 ON t3.a=t4.a)
 ON (t1.a=t2.a AND t1.b=t3.b) order by t2.b;
 
 DROP TABLE t1,t2,t3,t4;