bk commit into 5.0 tree (gkodinov:1.2256) 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 15:48:49+03:00, gkodinov@stripped +2 -0
  Bug #21302: Result not properly sorted when using an ORDER BY on a second table in a
join
   - undeterminstic tests fixed

  mysql-test/r/order_by.result@stripped, 2006-08-15 15:48:41+03:00, gkodinov@stripped +5 -5
    Bug #21302: Result not properly sorted when using an ORDER BY on a second table in a
join
     - more undeterminstic tests fixed

  mysql-test/t/order_by.test@stripped, 2006-08-15 15:48:41+03:00, gkodinov@stripped +1 -1
    Bug #21302: Result not properly sorted when using an ORDER BY on a second table in a
join
     - more undeterminstic tests fixed

# 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:	macbook.gmz
# Root:	/Users/kgeorge/mysql/work/B21302-fix-5.0-opt

--- 1.54/mysql-test/r/order_by.result	2006-08-15 15:49:04 +03:00
+++ 1.55/mysql-test/r/order_by.result	2006-08-15 15:49:04 +03:00
@@ -862,13 +862,13 @@ ORDER BY c;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	3	Using temporary; Using filesort
 1	SIMPLE	t2	const	PRIMARY	PRIMARY	4	const	1	
-SELECT t1.b as a, t2.b as c FROM 
+SELECT t2.b as c FROM 
 t1 LEFT JOIN t1 t2 ON (t1.a = t2.a AND t2.a = 2) 
 ORDER BY c;
-a	c
-1	NULL
-3	NULL
-2	2
+c
+NULL
+NULL
+2
 explain SELECT t1.b as a, t2.b as c FROM 
 t1 JOIN t1 t2 ON (t1.a = t2.a AND t2.a = 2)  
 ORDER BY c;

--- 1.38/mysql-test/t/order_by.test	2006-08-15 15:49:04 +03:00
+++ 1.39/mysql-test/t/order_by.test	2006-08-15 15:49:04 +03:00
@@ -589,7 +589,7 @@ INSERT INTO t1 VALUES (1,1), (2,2), (3,3
 explain SELECT t1.b as a, t2.b as c FROM 
  t1 LEFT JOIN t1 t2 ON (t1.a = t2.a AND t2.a = 2) 
 ORDER BY c;
-SELECT t1.b as a, t2.b as c FROM 
+SELECT t2.b as c FROM 
  t1 LEFT JOIN t1 t2 ON (t1.a = t2.a AND t2.a = 2) 
 ORDER BY c;