order_by.result, key_diff.result:

  updated


mysql-test/r/key_diff.result:
  updated
mysql-test/r/order_by.result:
  updated

mysql-test/r/key_diff.result

@@ -36,7 +36,7 @@ a	a	a	a
 explain select t1.*,t2.* from t1,t1 as t2 where t1.A=t2.B;
 table	type	possible_keys	key	key_len	ref	rows	Extra
 t1	ALL	a	NULL	NULL	NULL	5	
-t2	ALL	b	NULL	NULL	NULL	5	Using where
+t2	ref	b	b	4	t1.a	1	Using where
 select t1.*,t2.* from t1,t1 as t2 where t1.A=t2.B order by binary t1.a,t2.a;
 a	b	a	b
 A	B	a	a

mysql-test/r/order_by.result

@@ -450,9 +450,9 @@ gid	sid	uid
 103853	5	250
 EXPLAIN select t1.gid, t2.sid, t3.uid from t3, t2, t1 where t2.gid = t1.gid and t2.uid = t3.uid order by t1.gid, t3.uid;
 table	type	possible_keys	key	key_len	ref	rows	Extra
-t1	index	PRIMARY	PRIMARY	4	NULL	6	Using index
-t2	eq_ref	PRIMARY,uid	PRIMARY	4	t1.gid	1	
-t3	eq_ref	PRIMARY	PRIMARY	2	t2.uid	1	Using where; Using index
+t3	index	PRIMARY	PRIMARY	2	NULL	6	Using index; Using temporary; Using filesort
+t2	ref	PRIMARY,uid	uid	2	t3.uid	1	Using where
+t1	eq_ref	PRIMARY	PRIMARY	4	t2.gid	1	Using index
 EXPLAIN SELECT t1.gid, t3.uid from t1, t3 where t1.gid = t3.uid order by t1.gid,t3.skr;
 table	type	possible_keys	key	key_len	ref	rows	Extra
 t1	index	PRIMARY	PRIMARY	4	NULL	6	Using index