Merge lp:~kalebral-deactivatedaccount/drizzle/fix-622005 into lp:~drizzle-trunk/drizzle/development

[Lee Bieber]

For the feature request (https://blueprints.launchpad.net/drizzle/+spec/limit-maximum-sort-size) that is requesting the ability to cap various buffers, we first tried setting the join buffer to 1 to see how that would affect the test results and expose test results that need to sorted (by adding --sorted_result).

=== modified file 'plugin/filesystem_engine/tests/t/multiple_update.data'
--- plugin/filesystem_engine/tests/t/multiple_update.data	2010-06-18 04:58:30 +0000
+++ plugin/filesystem_engine/tests/t/multiple_update.data	2010-08-22 01:04:46 +0000
@@ -1,4 +1,4 @@
-777
 555
 333
 111
+777
 
=== modified file 'tests/r/distinct.result'
--- tests/r/distinct.result	2010-08-09 16:31:29 +0000
+++ tests/r/distinct.result	2010-08-22 01:04:46 +0000
@@ -397,8 +397,8 @@
 SELECT DISTINCTROW email, shipcode FROM t1, t2 WHERE t1.infoID=t2.infoID;
 email	shipcode
 [e-mail]	Z001
[e-mail]	R002
 [e-mail]	Z001
[e-mail]	R002
 [e-mail]	Z001
 SELECT DISTINCTROW email FROM t1 ORDER BY dateentered DESC;
 email
@@ -529,8 +529,8 @@
 EXPLAIN SELECT DISTINCT t1_1.a, t1_1.b FROM t1 t1_1, t1 t1_2
 WHERE t1_1.a = t1_2.a;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1_1	ALL	PRIMARY	NULL	NULL	NULL	3	Using where; Using join buffer
 1	SIMPLE	t1_2	index	PRIMARY	PRIMARY	4	NULL	3	Using index; Using temporary
-1	SIMPLE	t1_1	ALL	PRIMARY	NULL	NULL	NULL	3	Using where; Using join buffer
 EXPLAIN SELECT a FROM t1 GROUP BY a;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	index	NULL	PRIMARY	4	NULL	3	Using index
 
=== modified file 'tests/r/func_group.result'
--- tests/r/func_group.result	2010-08-20 18:39:24 +0000
+++ tests/r/func_group.result	2010-08-22 01:04:46 +0000
@@ -192,10 +192,10 @@
 insert into t2 values('BBB', 20, 1.0);
 select t1.a1, t1.a2, t2.a1, t2.a2 from t1,t2;
 a1	a2	a1	a2
+10	NULL	AAA	10
+10	NULL	BBB	20
 10	aaa	AAA	10
 10	aaa	BBB	20
-10	NULL	AAA	10
-10	NULL	BBB	20
 10	bbb	AAA	10
 10	bbb	BBB	20
 20	zzz	AAA	10
 
=== modified file 'tests/r/func_in.result'
--- tests/r/func_in.result	2009-12-15 16:55:05 +0000
+++ tests/r/func_in.result	2010-08-22 01:04:46 +0000
@@ -349,9 +349,9 @@
 JOIN t2 ON t3.a=t2.a
 JOIN t4 WHERE t4.a IN (t1.b, t2.b);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t3	index	PRIMARY	PRIMARY	4	NULL	4	Using index
 1	SIMPLE	t1	eq_ref	PRIMARY	PRIMARY	4	test.t3.a	1	
 1	SIMPLE	t2	ALL	PRIMARY	NULL	NULL	NULL	5	Using where; Using join buffer
+1	SIMPLE	t3	index	PRIMARY	PRIMARY	4	NULL	4	Using index
 1	SIMPLE	t4	ALL	PRIMARY	NULL	NULL	NULL	7	Range checked for each record (index map: 0x1)
 SELECT STRAIGHT_JOIN * FROM t3 
 JOIN t1 ON t3.a=t1.a 
@@ -367,9 +367,9 @@
 FROM t3, t1, t2
 WHERE t3.a=t1.a AND t3.a=t2.a;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	PRIMARY	t3	index	PRIMARY	PRIMARY	4	NULL	4	Using index
 1	PRIMARY	t1	eq_ref	PRIMARY	PRIMARY	4	test.t3.a	1	
 1	PRIMARY	t2	ALL	PRIMARY	NULL	NULL	NULL	5	Using where; Using join buffer
+1	PRIMARY	t3	index	PRIMARY	PRIMARY	4	NULL	4	Using index
 2	DEPENDENT SUBQUERY	t4	index	NULL	PRIMARY	4	NULL	7	Using where; Using index
 SELECT STRAIGHT_JOIN 
 (SELECT SUM(t4.a) FROM t4 WHERE t4.a IN (t1.b, t2.b)) 
 
=== modified file 'tests/r/func_time.result'
--- tests/r/func_time.result	2010-07-12 06:26:42 +0000
+++ tests/r/func_time.result	2010-08-22 01:04:46 +0000
@@ -805,18 +805,18 @@
 '2005.09.01' - INTERVAL 6 MONTH AND t2.day;
 id	day	id	day
 1	2005-06-01	1	2005-08-01
-3	2005-07-01	1	2005-08-01
 1	2005-06-01	2	2005-06-15
 1	2005-06-01	3	2005-07-15
[phone]-08-01
 3	2005-07-01	3	2005-07-15
 SELECT * FROM t1, t2 
 WHERE CAST(t1.day AS DATE) BETWEEN 
 '2005.09.01' - INTERVAL 6 MONTH AND t2.day;
 id	day	id	day
 1	2005-06-01	1	2005-08-01
-3	2005-07-01	1	2005-08-01
 1	2005-06-01	2	2005-06-15
 1	2005-06-01	3	2005-07-15
[phone]-08-01
 3	2005-07-01	3	2005-07-15
 DROP TABLE t1,t2;
 create table t1 (field DATE);
 
=== modified file 'tests/r/greedy_optimizer.result'
--- tests/r/greedy_optimizer.result	2010-02-15 18:29:31 +0000
+++ tests/r/greedy_optimizer.result	2010-08-22 01:04:46 +0000
@@ -224,10 +224,10 @@
 Last_query_cost	#
 explain select t1.c11 from t1, t2, t3, t4, t5, t6, t7 where t1.c11 = t2.c21 and t1.c12 = t3.c31 and t1.c13 = t4.c41 and t1.c14 = t5.c51 and t1.c15 = t6.c61 and t1.c16 = t7.c71;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	#	t1	eq_ref	PRIMARY	PRIMARY	4	test.t2.c21	1	Using where
 1	#	t2	ALL	NULL	NULL	NULL	NULL	6	
+1	#	t3	eq_ref	PRIMARY	PRIMARY	4	test.t1.c12	1	Using index
 1	#	t4	ALL	NULL	NULL	NULL	NULL	12	Using join buffer
-1	#	t1	eq_ref	PRIMARY	PRIMARY	4	test.t2.c21	1	Using where
-1	#	t3	eq_ref	PRIMARY	PRIMARY	4	test.t1.c12	1	Using index
 1	#	t5	eq_ref	PRIMARY	PRIMARY	4	test.t1.c14	1	Using index
 1	#	t6	ALL	NULL	NULL	NULL	NULL	18	Using where; Using join buffer
 1	#	t7	eq_ref	PRIMARY	PRIMARY	4	test.t1.c16	1	Using index
@@ -236,10 +236,10 @@
 Last_query_cost	#
 explain select t1.c11 from t7, t6, t5, t4, t3, t2, t1 where t1.c11 = t2.c21 and t1.c12 = t3.c31 and t1.c13 = t4.c41 and t1.c14 = t5.c51 and t1.c15 = t6.c61 and t1.c16 = t7.c71;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	eq_ref	PRIMARY	PRIMARY	4	test.t2.c21	1	Using where
 1	SIMPLE	t2	ALL	NULL	NULL	NULL	NULL	6	
+1	SIMPLE	t3	eq_ref	PRIMARY	PRIMARY	4	test.t1.c12	1	Using index
 1	SIMPLE	t4	ALL	NULL	NULL	NULL	NULL	12	Using join buffer
-1	SIMPLE	t1	eq_ref	PRIMARY	PRIMARY	4	test.t2.c21	1	Using where
-1	SIMPLE	t3	eq_ref	PRIMARY	PRIMARY	4	test.t1.c12	1	Using index
 1	SIMPLE	t5	eq_ref	PRIMARY	PRIMARY	4	test.t1.c14	1	Using index
 1	SIMPLE	t6	ALL	NULL	NULL	NULL	NULL	18	Using where; Using join buffer
 1	SIMPLE	t7	eq_ref	PRIMARY	PRIMARY	4	test.t1.c16	1	Using index
@@ -248,10 +248,10 @@
 Last_query_cost	#
 explain select t1.c11 from t1, t2, t3, t4, t5, t6, t7 where t1.c11 = t2.c21 and t1.c12 = t3.c31 and t1.c13 = t4.c41 and t1.c14 = t5.c51 and t1.c15 = t6.c61 and t1.c16 = t7.c71 and t2.c22 = t3.c32 and t2.c23 = t4.c42 and t2.c24 = t5.c52 and t2.c25 = t6.c62 and t2.c26 = t7.c72 and t3.c33 = t4.c43 and t3.c34 = t5.c53 and t3.c35 = t6.c63 and t3.c36 = t7.c73 and t4.c42 = t5.c54 and t4.c43 = t6.c64 and t4.c44 = t7.c74 and t5.c52 = t6.c65 and t5.c53 = t7.c75 and t6.c62 = t7.c76;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	eq_ref	PRIMARY	PRIMARY	4	test.t2.c21	1	Using where
 1	SIMPLE	t2	ALL	NULL	NULL	NULL	NULL	6	
+1	SIMPLE	t3	eq_ref	PRIMARY	PRIMARY	4	test.t1.c12	1	Using where
 1	SIMPLE	t4	ALL	NULL	NULL	NULL	NULL	12	Using where; Using join buffer
-1	SIMPLE	t1	eq_ref	PRIMARY	PRIMARY	4	test.t2.c21	1	Using where
-1	SIMPLE	t3	eq_ref	PRIMARY	PRIMARY	4	test.t1.c12	1	Using where
 1	SIMPLE	t5	eq_ref	PRIMARY	PRIMARY	4	test.t1.c14	1	Using where
 1	SIMPLE	t6	ALL	NULL	NULL	NULL	NULL	18	Using where; Using join buffer
 1	SIMPLE	t7	eq_ref	PRIMARY	PRIMARY	4	test.t1.c16	1	Using where
@@ -301,12 +301,12 @@
 explain select t1.c11 from t1, t2, t3, t4, t5, t6, t7 where t1.c11 = t2.c21 and t1.c12 = t3.c31 and t1.c13 = t4.c41 and t1.c14 = t5.c51 and t1.c15 = t6.c61 and t1.c16 = t7.c71;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	ALL	PRIMARY	NULL	NULL	NULL	3	
+1	SIMPLE	t2	ALL	NULL	NULL	NULL	NULL	6	Using where; Using join buffer
 1	SIMPLE	t3	eq_ref	PRIMARY	PRIMARY	4	test.t1.c12	1	Using index
+1	SIMPLE	t4	ALL	NULL	NULL	NULL	NULL	12	Using where; Using join buffer
 1	SIMPLE	t5	eq_ref	PRIMARY	PRIMARY	4	test.t1.c14	1	Using index
+1	SIMPLE	t6	ALL	NULL	NULL	NULL	NULL	18	Using where; Using join buffer
 1	SIMPLE	t7	eq_ref	PRIMARY	PRIMARY	4	test.t1.c16	1	Using index
-1	SIMPLE	t2	ALL	NULL	NULL	NULL	NULL	6	Using where; Using join buffer
-1	SIMPLE	t4	ALL	NULL	NULL	NULL	NULL	12	Using where; Using join buffer
-1	SIMPLE	t6	ALL	NULL	NULL	NULL	NULL	18	Using where; Using join buffer
 show status like 'Last_query_cost';
 Variable_name	Value
 Last_query_cost	#
@@ -325,12 +325,12 @@
 explain select t1.c11 from t1, t2, t3, t4, t5, t6, t7 where t1.c11 = t2.c21 and t1.c12 = t3.c31 and t1.c13 = t4.c41 and t1.c14 = t5.c51 and t1.c15 = t6.c61 and t1.c16 = t7.c71 and t2.c22 = t3.c32 and t2.c23 = t4.c42 and t2.c24 = t5.c52 and t2.c25 = t6.c62 and t2.c26 = t7.c72 and t3.c33 = t4.c43 and t3.c34 = t5.c53 and t3.c35 = t6.c63 and t3.c36 = t7.c73 and t4.c42 = t5.c54 and t4.c43 = t6.c64 and t4.c44 = t7.c74 and t5.c52 = t6.c65 and t5.c53 = t7.c75 and t6.c62 = t7.c76;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	ALL	PRIMARY	NULL	NULL	NULL	3	
+1	SIMPLE	t2	ALL	NULL	NULL	NULL	NULL	6	Using where; Using join buffer
 1	SIMPLE	t3	eq_ref	PRIMARY	PRIMARY	4	test.t1.c12	1	
+1	SIMPLE	t4	ALL	NULL	NULL	NULL	NULL	12	Using where; Using join buffer
 1	SIMPLE	t5	eq_ref	PRIMARY	PRIMARY	4	test.t1.c14	1	Using where
+1	SIMPLE	t6	ALL	NULL	NULL	NULL	NULL	18	Using where; Using join buffer
 1	SIMPLE	t7	eq_ref	PRIMARY	PRIMARY	4	test.t1.c16	1	Using where
-1	SIMPLE	t2	ALL	NULL	NULL	NULL	NULL	6	Using where; Using join buffer
-1	SIMPLE	t4	ALL	NULL	NULL	NULL	NULL	12	Using where; Using join buffer
-1	SIMPLE	t6	ALL	NULL	NULL	NULL	NULL	18	Using where; Using join buffer
 show status like 'Last_query_cost';
 Variable_name	Value
 Last_query_cost	#
@@ -376,10 +376,10 @@
 Last_query_cost	#
 explain select t1.c11 from t1, t2, t3, t4, t5, t6, t7 where t1.c11 = t2.c21 and t1.c12 = t3.c31 and t1.c13 = t4.c41 and t1.c14 = t5.c51 and t1.c15 = t6.c61 and t1.c16 = t7.c71;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	eq_ref	PRIMARY	PRIMARY	4	test.t2.c21	1	Using where
 1	SIMPLE	t2	ALL	NULL	NULL	NULL	NULL	6	
+1	SIMPLE	t3	eq_ref	PRIMARY	PRIMARY	4	test.t1.c12	1	Using index
 1	SIMPLE	t4	ALL	NULL	NULL	NULL	NULL	12	Using join buffer
-1	SIMPLE	t1	eq_ref	PRIMARY	PRIMARY	4	test.t2.c21	1	Using where
-1	SIMPLE	t3	eq_ref	PRIMARY	PRIMARY	4	test.t1.c12	1	Using index
 1	SIMPLE	t5	eq_ref	PRIMARY	PRIMARY	4	test.t1.c14	1	Using index
 1	SIMPLE	t6	ALL	NULL	NULL	NULL	NULL	18	Using where; Using join buffer
 1	SIMPLE	t7	eq_ref	PRIMARY	PRIMARY	4	test.t1.c16	1	Using index
@@ -388,10 +388,10 @@
 Last_query_cost	#
 explain select t1.c11 from t7, t6, t5, t4, t3, t2, t1 where t1.c11 = t2.c21 and t1.c12 = t3.c31 and t1.c13 = t4.c41 and t1.c14 = t5.c51 and t1.c15 = t6.c61 and t1.c16 = t7.c71;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	eq_ref	PRIMARY	PRIMARY	4	test.t2.c21	1	Using where
 1	SIMPLE	t2	ALL	NULL	NULL	NULL	NULL	6	
+1	SIMPLE	t3	eq_ref	PRIMARY	PRIMARY	4	test.t1.c12	1	Using index
 1	SIMPLE	t4	ALL	NULL	NULL	NULL	NULL	12	Using join buffer
-1	SIMPLE	t1	eq_ref	PRIMARY	PRIMARY	4	test.t2.c21	1	Using where
-1	SIMPLE	t3	eq_ref	PRIMARY	PRIMARY	4	test.t1.c12	1	Using index
 1	SIMPLE	t5	eq_ref	PRIMARY	PRIMARY	4	test.t1.c14	1	Using index
 1	SIMPLE	t6	ALL	NULL	NULL	NULL	NULL	18	Using where; Using join buffer
 1	SIMPLE	t7	eq_ref	PRIMARY	PRIMARY	4	test.t1.c16	1	Using index
@@ -400,10 +400,10 @@
 Last_query_cost	#
 explain select t1.c11 from t1, t2, t3, t4, t5, t6, t7 where t1.c11 = t2.c21 and t1.c12 = t3.c31 and t1.c13 = t4.c41 and t1.c14 = t5.c51 and t1.c15 = t6.c61 and t1.c16 = t7.c71 and t2.c22 = t3.c32 and t2.c23 = t4.c42 and t2.c24 = t5.c52 and t2.c25 = t6.c62 and t2.c26 = t7.c72 and t3.c33 = t4.c43 and t3.c34 = t5.c53 and t3.c35 = t6.c63 and t3.c36 = t7.c73 and t4.c42 = t5.c54 and t4.c43 = t6.c64 and t4.c44 = t7.c74 and t5.c52 = t6.c65 and t5.c53 = t7.c75 and t6.c62 = t7.c76;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	eq_ref	PRIMARY	PRIMARY	4	test.t2.c21	1	Using where
 1	SIMPLE	t2	ALL	NULL	NULL	NULL	NULL	6	
+1	SIMPLE	t3	eq_ref	PRIMARY	PRIMARY	4	test.t1.c12	1	Using where
 1	SIMPLE	t4	ALL	NULL	NULL	NULL	NULL	12	Using where; Using join buffer
-1	SIMPLE	t1	eq_ref	PRIMARY	PRIMARY	4	test.t2.c21	1	Using where
-1	SIMPLE	t3	eq_ref	PRIMARY	PRIMARY	4	test.t1.c12	1	Using where
 1	SIMPLE	t5	eq_ref	PRIMARY	PRIMARY	4	test.t1.c14	1	Using where
 1	SIMPLE	t6	ALL	NULL	NULL	NULL	NULL	18	Using where; Using join buffer
 1	SIMPLE	t7	eq_ref	PRIMARY	PRIMARY	4	test.t1.c16	1	Using where
@@ -412,10 +412,10 @@
 Last_query_cost	#
 explain select t1.c11 from t7, t6, t5, t4, t3, t2, t1 where t1.c11 = t2.c21 and t1.c12 = t3.c31 and t1.c13 = t4.c41 and t1.c14 = t5.c51 and t1.c15 = t6.c61 and t1.c16 = t7.c71 and t2.c22 = t3.c32 and t2.c23 = t4.c42 and t2.c24 = t5.c52 and t2.c25 = t6.c62 and t2.c26 = t7.c72 and t3.c33 = t4.c43 and t3.c34 = t5.c53 and t3.c35 = t6.c63 and t3.c36 = t7.c73 and t4.c42 = t5.c54 and t4.c43 = t6.c64 and t4.c44 = t7.c74 and t5.c52 = t6.c65 and t5.c53 = t7.c75 and t6.c62 = t7.c76;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	eq_ref	PRIMARY	PRIMARY	4	test.t2.c21	1	Using where
 1	SIMPLE	t2	ALL	NULL	NULL	NULL	NULL	6	
+1	SIMPLE	t3	eq_ref	PRIMARY	PRIMARY	4	test.t1.c12	1	Using where
 1	SIMPLE	t4	ALL	NULL	NULL	NULL	NULL	12	Using where; Using join buffer
-1	SIMPLE	t1	eq_ref	PRIMARY	PRIMARY	4	test.t2.c21	1	Using where
-1	SIMPLE	t3	eq_ref	PRIMARY	PRIMARY	4	test.t1.c12	1	Using where
 1	SIMPLE	t5	eq_ref	PRIMARY	PRIMARY	4	test.t1.c14	1	Using where
 1	SIMPLE	t6	ALL	NULL	NULL	NULL	NULL	18	Using where; Using join buffer
 1	SIMPLE	t7	eq_ref	PRIMARY	PRIMARY	4	test.t1.c16	1	Using where
 
=== modified file 'tests/r/group_min_max.result'
--- tests/r/group_min_max.result	2009-11-26 02:37:40 +0000
+++ tests/r/group_min_max.result	2010-08-22 01:04:46 +0000
@@ -1611,24 +1611,24 @@
 select distinct t1.a1,t2.a1 from t1,t2;
 a1	a1
 a	a
-b	a
-c	a
-d	a
 a	b
-b	b
-c	b
-d	b
 a	c
+a	d
+a	e
+b	a
+b	b
 b	c
-c	c
-d	c
-a	d
 b	d
+b	e
+c	a
+c	b
+c	c
 c	d
-d	d
-a	e
-b	e
 c	e
+d	a
+d	b
+d	c
+d	d
 d	e
 explain select distinct a1,a2,b from t1;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 
=== modified file 'tests/r/join.result'
--- tests/r/join.result	2010-02-15 18:29:31 +0000
+++ tests/r/join.result	2010-08-22 01:04:46 +0000
@@ -599,30 +599,30 @@
 3	1	2	2
 select * from (t1 cross join t2) join (t3 cross join t4) on (a < y and t2.b < t3.c);
 c	b	a	b	b	c	y	c
[phone]
 10	1	2	1	1	3	11	3
-10	1	2	1	1	10	11	3
[phone]
 3	1	2	1	1	3	11	3
-3	1	2	1	1	10	11	3
[phone]
 3	2	2	1	1	3	11	3
-3	2	2	1	1	10	11	3
 select * from (t1, t2) join (t3, t4) on (a < y and t2.b < t3.c);
 c	b	a	b	b	c	y	c
[phone]
 10	1	2	1	1	3	11	3
-10	1	2	1	1	10	11	3
[phone]
 3	1	2	1	1	3	11	3
-3	1	2	1	1	10	11	3
[phone]
 3	2	2	1	1	3	11	3
-3	2	2	1	1	10	11	3
 select * from (t1 natural join t2) join (t3 natural join t4) on a = y;
 b	c	a	c	b	y
 1	10	2	3	1	2
 1	3	2	3	1	2
 select * from ((t3 join (t1 join t2 on c > a) on t3.b < t2.a) join t4 on y > t1.c) join t5 on z = t1.b + 3;
 b	c	c	b	a	b	y	c	y	z
[phone]
[phone]
 1	3	10	1	2	1	11	3	11	4
-1	10	10	1	2	1	11	3	11	4
 1	3	3	1	2	1	11	3	11	4
-1	10	3	1	2	1	11	3	11	4
 select * from t1 natural join t2 where t1.b > 0;
 b	c	a
 1	10	2
 
=== modified file 'tests/r/join_nested.result'
--- tests/r/join_nested.result	2010-08-09 16:31:29 +0000
+++ tests/r/join_nested.result	2010-08-22 01:04:46 +0000
@@ -39,8 +39,8 @@
 FROM t3,t4;
 a	b	a	b
 1	2	3	2
+1	2	4	2
 2	2	3	2
-1	2	4	2
 2	2	4	2
 SELECT t2.a,t2.b,t3.a,t3.b,t4.a,t4.b
 FROM t2
@@ -108,17 +108,17 @@
 SELECT t3.a,t3.b,t4.a,t4.b,t5.a,t5.b
 FROM t3,t4,t5;
 a	b	a	b	a	b
+1	2	3	2	2	2
 1	2	3	2	3	1
-2	2	3	2	3	1
+1	2	3	2	3	3
+1	2	4	2	2	2
 1	2	4	2	3	1
-2	2	4	2	3	1
-1	2	3	2	2	2
+1	2	4	2	3	3
 2	2	3	2	2	2
-1	2	4	2	2	2
-2	2	4	2	2	2
-1	2	3	2	3	3
+2	2	3	2	3	1
 2	2	3	2	3	3
-1	2	4	2	3	3
+2	2	4	2	2	2
+2	2	4	2	3	1
 2	2	4	2	3	3
 SELECT t2.a,t2.b,t3.a,t3.b,t4.a,t4.b,t5.a,t5.b
 FROM t2
@@ -212,10 +212,10 @@
 a	b	a	b
 3	2	1	1
 3	2	2	2
+6	1	1	1
+6	1	2	2
 6	2	1	1
 6	2	2	2
-6	1	1	1
-6	1	2	2
 SELECT t8.a,t8.b
 FROM t8;
 a	b
@@ -228,11 +228,11 @@
 t8
 ON t7.b=t8.b AND t6.b < 10;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t7	ALL	NULL	NULL	NULL	NULL	2	100.00	
 1	SIMPLE	t6	ALL	NULL	NULL	NULL	NULL	3	100.00	Using join buffer
+1	SIMPLE	t7	ALL	NULL	NULL	NULL	NULL	2	100.00	
 1	SIMPLE	t8	ALL	NULL	NULL	NULL	NULL	2	100.00	
-Warnings:
 Note	1003	select `test`.`t6`.`a` AS `a`,`test`.`t6`.`b` AS `b`,`test`.`t7`.`a` AS `a`,`test`.`t7`.`b` AS `b`,`test`.`t8`.`a` AS `a`,`test`.`t8`.`b` AS `b` from `test`.`t6` join `test`.`t7` left join `test`.`t8` on(((`test`.`t7`.`b` = `test`.`t8`.`b`) and (`test`.`t6`.`b` < 10))) where 1
+Warnings:
 SELECT t6.a,t6.b,t7.a,t7.b,t8.a,t8.b
 FROM (t6, t7)
 LEFT JOIN 
@@ -361,17 +361,17 @@
 WHERE t2.a > 3 AND
 (t6.a < 6 OR t6.c IS NULL);
 a	b	a	b	a	b	a	b	a	b	a	b	a	b
-4	2	1	2	3	2	3	1	3	2	1	1	NULL	NULL
-4	2	1	2	4	2	3	1	3	2	1	1	NULL	NULL
-5	3	NULL	NULL	NULL	NULL	3	1	3	2	1	1	NULL	NULL
 4	2	1	2	3	2	2	2	3	2	2	2	0	2
 4	2	1	2	3	2	2	2	3	2	2	2	1	2
[phone]	NULL	NULL
[phone]	NULL	NULL	NULL	NULL	NULL	NULL
 4	2	1	2	4	2	2	2	3	2	2	2	0	2
 4	2	1	2	4	2	2	2	3	2	2	2	1	2
[phone]	NULL	NULL
[phone]	NULL	NULL	NULL	NULL	NULL	NULL
 5	3	NULL	NULL	NULL	NULL	2	2	3	2	2	2	0	2
 5	3	NULL	NULL	NULL	NULL	2	2	3	2	2	2	1	2
-4	2	1	2	3	2	3	3	NULL	NULL	NULL	NULL	NULL	NULL
-4	2	1	2	4	2	3	3	NULL	NULL	NULL	NULL	NULL	NULL
+5	3	NULL	NULL	NULL	NULL	3	1	3	2	1	1	NULL	NULL
 5	3	NULL	NULL	NULL	NULL	3	3	NULL	NULL	NULL	NULL	NULL	NULL
 SELECT t1.a,t1.b
 FROM t1;
@@ -644,12 +644,12 @@
 1	SIMPLE	t3	ALL	NULL	NULL	NULL	NULL	2	100.00	Using where
 1	SIMPLE	t4	ALL	NULL	NULL	NULL	NULL	2	100.00	Using where
 1	SIMPLE	t5	ALL	NULL	NULL	NULL	NULL	3	100.00	Using where
+1	SIMPLE	t6	ALL	NULL	NULL	NULL	NULL	3	100.00	Using where
 1	SIMPLE	t7	ALL	NULL	NULL	NULL	NULL	2	100.00	Using where
-1	SIMPLE	t6	ALL	NULL	NULL	NULL	NULL	3	100.00	Using where
 1	SIMPLE	t8	ALL	NULL	NULL	NULL	NULL	2	100.00	Using where
 1	SIMPLE	t9	ALL	NULL	NULL	NULL	NULL	3	100.00	Using where; Using join buffer
+Note	1003	select `test`.`t0`.`a` AS `a`,`test`.`t0`.`b` AS `b`,`test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b`,`test`.`t2`.`a` AS `a`,`test`.`t2`.`b` AS `b`,`test`.`t3`.`a` AS `a`,`test`.`t3`.`b` AS `b`,`test`.`t4`.`a` AS `a`,`test`.`t4`.`b` AS `b`,`test`.`t5`.`a` AS `a`,`test`.`t5`.`b` AS `b`,`test`.`t6`.`a` AS `a`,`test`.`t6`.`b` AS `b`,`test`.`t7`.`a` AS `a`,`test`.`t7`.`b` AS `b`,`test`.`t8`.`a` AS `a`,`test`.`t8`.`b` AS `b`,`test`.`t9`.`a` AS `a`,`test`.`t9`.`b` AS `b` from `test`.`t0` join `test`.`t1` left join (`test`.`t2` left join (`test`.`t3` join `test`.`t4`) on(((`test`.`t4`.`b` = `test`.`t2`.`b`) and (`test`.`t3`.`a` = 1))) join `test`.`t5` left join (`test`.`t6` join `test`.`t7` left join `test`.`t8` on(((`test`.`t8`.`b` = `test`.`t5`.`b`) and (`test`.`t6`.`b` < 10)))) on(((`test`.`t7`.`b` = `test`.`t5`.`b`) and (`test`.`t6`.`b` >= 2)))) on((((`test`.`t3`.`b` = 2) or isnull(`test`.`t3`.`c`)) and ((`test`.`t6`.`b` = 2) or isnull(`test`.`t6`.`c`)) and ((`test`.`t5`.`b` = `test`.`t0`.`b`) or isnull(`test`.`t3`.`c`) or isnull(`test`.`t6`.`c`) or isnull(`test`.`t8`.`c`)) and (`test`.`t1`.`a` <> 2))) join `test`.`t9` where ((`test`.`t9`.`a` = 1) and (`test`.`t1`.`b` = `test`.`t0`.`b`) and (`test`.`t0`.`a` = 1) and ((`test`.`t2`.`a` >= 4) or isnull(`test`.`t2`.`c`)) and ((`test`.`t3`.`a` < 5) or isnull(`test`.`t3`.`c`)) and ((`test`.`t4`.`b` = `test`.`t3`.`b`) or isnull(`test`.`t3`.`c`) or isnull(`test`.`t4`.`c`)) and ((`test`.`t5`.`a` >= 2) or isnull(`test`.`t5`.`c`)) and ((`test`.`t6`.`a` >= 4) or isnull(`test`.`t6`.`c`)) and ((`test`.`t7`.`a` <= 2) or isnull(`test`.`t7`.`c`)) and ((`test`.`t8`.`a` < 1) or isnull(`test`.`t8`.`c`)) and ((`test`.`t9`.`b` = `test`.`t8`.`b`) or isnull(`test`.`t8`.`c`)))
 Warnings:
-Note	1003	select `test`.`t0`.`a` AS `a`,`test`.`t0`.`b` AS `b`,`test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b`,`test`.`t2`.`a` AS `a`,`test`.`t2`.`b` AS `b`,`test`.`t3`.`a` AS `a`,`test`.`t3`.`b` AS `b`,`test`.`t4`.`a` AS `a`,`test`.`t4`.`b` AS `b`,`test`.`t5`.`a` AS `a`,`test`.`t5`.`b` AS `b`,`test`.`t6`.`a` AS `a`,`test`.`t6`.`b` AS `b`,`test`.`t7`.`a` AS `a`,`test`.`t7`.`b` AS `b`,`test`.`t8`.`a` AS `a`,`test`.`t8`.`b` AS `b`,`test`.`t9`.`a` AS `a`,`test`.`t9`.`b` AS `b` from `test`.`t0` join `test`.`t1` left join (`test`.`t2` left join (`test`.`t3` join `test`.`t4`) on(((`test`.`t4`.`b` = `test`.`t2`.`b`) and (`test`.`t3`.`a` = 1))) join `test`.`t5` left join (`test`.`t6` join `test`.`t7` left join `test`.`t8` on(((`test`.`t8`.`b` = `test`.`t5`.`b`) and (`test`.`t6`.`b` < 10)))) on(((`test`.`t7`.`b` = `test`.`t5`.`b`) and (`test`.`t6`.`b` >= 2)))) on((((`test`.`t3`.`b` = 2) or isnull(`test`.`t3`.`c`)) and ((`test`.`t6`.`b` = 2) or isnull(`test`.`t6`.`c`)) and ((`test`.`t5`.`b` = `test`.`t0`.`b`) or isnull(`test`.`t3`.`c`) or isnull(`test`.`t6`.`c`) or isnull(`test`.`t8`.`c`)) and (`test`.`t1`.`a` <> 2))) join `test`.`t9` where ((`test`.`t9`.`a` = 1) and (`test`.`t1`.`b` = `test`.`t0`.`b`) and (`test`.`t0`.`a` = 1) and ((`test`.`t2`.`a` >= 4) or isnull(`test`.`t2`.`c`)) and ((`test`.`t3`.`a` < 5) or isnull(`test`.`t3`.`c`)) and ((`test`.`t4`.`b` = `test`.`t3`.`b`) or isnull(`test`.`t3`.`c`) or isnull(`test`.`t4`.`c`)) and ((`test`.`t5`.`a` >= 2) or isnull(`test`.`t5`.`c`)) and ((`test`.`t6`.`a` >= 4) or isnull(`test`.`t6`.`c`)) and ((`test`.`t7`.`a` <= 2) or isnull(`test`.`t7`.`c`)) and ((`test`.`t8`.`a` < 1) or isnull(`test`.`t8`.`c`)) and ((`test`.`t9`.`b` = `test`.`t8`.`b`) or isnull(`test`.`t8`.`c`)))
 SELECT t9.a,t9.b
 FROM t9;
 a	b
@@ -743,12 +743,12 @@
 WHERE t1.a <= 2;
 a	b	a	b	a	b
 1	3	3	3	NULL	NULL
-2	2	3	3	NULL	NULL
 1	3	4	2	1	2
 1	3	4	2	2	2
+1	3	5	3	NULL	NULL
+2	2	3	3	NULL	NULL
 2	2	4	2	1	2
 2	2	4	2	2	2
-1	3	5	3	NULL	NULL
 2	2	5	3	NULL	NULL
 SELECT t1.a,t1.b,t2.a,t2.b,t3.a,t3.b
 FROM t1, t3 
@@ -758,12 +758,12 @@
 WHERE t1.a <= 2;
 a	b	a	b	a	b
 1	3	3	3	NULL	NULL
-2	2	3	3	NULL	NULL
 1	3	4	2	1	2
 1	3	4	2	2	2
+1	3	5	3	NULL	NULL
+2	2	3	3	NULL	NULL
 2	2	4	2	1	2
 2	2	4	2	2	2
-1	3	5	3	NULL	NULL
 2	2	5	3	NULL	NULL
 SELECT t3.a,t3.b,t4.a,t4.b
 FROM t3,t4;
@@ -790,12 +790,12 @@
 WHERE t1.a <= 2;
 a	b	a	b	a	b	a	b
 1	3	3	3	NULL	NULL	NULL	NULL
-2	2	3	3	NULL	NULL	NULL	NULL
 1	3	4	2	1	2	3	2
 1	3	4	2	1	2	4	2
+1	3	5	3	NULL	NULL	NULL	NULL
+2	2	3	3	NULL	NULL	NULL	NULL
 2	2	4	2	1	2	3	2
 2	2	4	2	1	2	4	2
-1	3	5	3	NULL	NULL	NULL	NULL
 2	2	5	3	NULL	NULL	NULL	NULL
 SELECT t1.a,t1.b,t2.a,t2.b,t3.a,t3.b,t4.a,t4.b
 FROM t1, (t3, t4) 
@@ -805,12 +805,12 @@
 WHERE t1.a <= 2;
 a	b	a	b	a	b	a	b
 1	3	3	3	NULL	NULL	NULL	NULL
-2	2	3	3	NULL	NULL	NULL	NULL
 1	3	4	2	1	2	3	2
 1	3	4	2	1	2	4	2
+1	3	5	3	NULL	NULL	NULL	NULL
+2	2	3	3	NULL	NULL	NULL	NULL
 2	2	4	2	1	2	3	2
 2	2	4	2	1	2	4	2
-1	3	5	3	NULL	NULL	NULL	NULL
 2	2	5	3	NULL	NULL	NULL	NULL
 SELECT t1.a,t1.b,t2.a,t2.b,t3.a,t3.b,t4.a,t4.b
 FROM t1, (t3, t4)
@@ -849,12 +849,12 @@
 (t1,t2)
 ON t3.a=1 AND t3.b=t2.b AND t2.b=t4.b;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	3	100.00	
+1	SIMPLE	t2	ref	idx_b	idx_b	5	test.t3.b	1	100.00	
 1	SIMPLE	t3	ALL	NULL	NULL	NULL	NULL	2	100.00	
 1	SIMPLE	t4	ALL	NULL	NULL	NULL	NULL	2	100.00	Using join buffer
-1	SIMPLE	t2	ref	idx_b	idx_b	5	test.t3.b	1	100.00	
-1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	3	100.00	
-Warnings:
 Note	1003	select `test`.`t2`.`a` AS `a`,`test`.`t2`.`b` AS `b`,`test`.`t3`.`a` AS `a`,`test`.`t3`.`b` AS `b`,`test`.`t4`.`a` AS `a`,`test`.`t4`.`b` AS `b` from `test`.`t3` join `test`.`t4` left join (`test`.`t1` join `test`.`t2`) on(((`test`.`t3`.`a` = 1) and (`test`.`t3`.`b` = `test`.`t2`.`b`) and (`test`.`t2`.`b` = `test`.`t4`.`b`))) where 1
+Warnings:
 SELECT t2.a,t2.b,t3.a,t3.b,t4.a,t4.b
 FROM (t3,t4)
 LEFT JOIN              
@@ -911,12 +911,12 @@
 1	SIMPLE	t3	ALL	NULL	NULL	NULL	NULL	2	100.00	Using where
 1	SIMPLE	t4	ALL	NULL	NULL	NULL	NULL	2	100.00	Using where
 1	SIMPLE	t5	ALL	NULL	NULL	NULL	NULL	3	100.00	Using where
+1	SIMPLE	t6	ALL	NULL	NULL	NULL	NULL	3	100.00	Using where
 1	SIMPLE	t7	ALL	NULL	NULL	NULL	NULL	2	100.00	Using where
-1	SIMPLE	t6	ALL	NULL	NULL	NULL	NULL	3	100.00	Using where
 1	SIMPLE	t8	ALL	NULL	NULL	NULL	NULL	2	100.00	Using where
 1	SIMPLE	t9	ALL	NULL	NULL	NULL	NULL	3	100.00	Using where; Using join buffer
+Note	1003	select `test`.`t0`.`a` AS `a`,`test`.`t0`.`b` AS `b`,`test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b`,`test`.`t2`.`a` AS `a`,`test`.`t2`.`b` AS `b`,`test`.`t3`.`a` AS `a`,`test`.`t3`.`b` AS `b`,`test`.`t4`.`a` AS `a`,`test`.`t4`.`b` AS `b`,`test`.`t5`.`a` AS `a`,`test`.`t5`.`b` AS `b`,`test`.`t6`.`a` AS `a`,`test`.`t6`.`b` AS `b`,`test`.`t7`.`a` AS `a`,`test`.`t7`.`b` AS `b`,`test`.`t8`.`a` AS `a`,`test`.`t8`.`b` AS `b`,`test`.`t9`.`a` AS `a`,`test`.`t9`.`b` AS `b` from `test`.`t0` join `test`.`t1` left join (`test`.`t2` left join (`test`.`t3` join `test`.`t4`) on(((`test`.`t4`.`b` = `test`.`t2`.`b`) and (`test`.`t3`.`a` = 1))) join `test`.`t5` left join (`test`.`t6` join `test`.`t7` left join `test`.`t8` on(((`test`.`t8`.`b` = `test`.`t5`.`b`) and (`test`.`t6`.`b` < 10)))) on(((`test`.`t7`.`b` = `test`.`t5`.`b`) and (`test`.`t6`.`b` >= 2)))) on((((`test`.`t3`.`b` = 2) or isnull(`test`.`t3`.`c`)) and ((`test`.`t6`.`b` = 2) or isnull(`test`.`t6`.`c`)) and ((`test`.`t5`.`b` = `test`.`t0`.`b`) or isnull(`test`.`t3`.`c`) or isnull(`test`.`t6`.`c`) or isnull(`test`.`t8`.`c`)) and (`test`.`t1`.`a` <> 2))) join `test`.`t9` where ((`test`.`t9`.`a` = 1) and (`test`.`t1`.`b` = `test`.`t0`.`b`) and (`test`.`t0`.`a` = 1) and ((`test`.`t2`.`a` >= 4) or isnull(`test`.`t2`.`c`)) and ((`test`.`t3`.`a` < 5) or isnull(`test`.`t3`.`c`)) and ((`test`.`t4`.`b` = `test`.`t3`.`b`) or isnull(`test`.`t3`.`c`) or isnull(`test`.`t4`.`c`)) and ((`test`.`t5`.`a` >= 2) or isnull(`test`.`t5`.`c`)) and ((`test`.`t6`.`a` >= 4) or isnull(`test`.`t6`.`c`)) and ((`test`.`t7`.`a` <= 2) or isnull(`test`.`t7`.`c`)) and ((`test`.`t8`.`a` < 1) or isnull(`test`.`t8`.`c`)) and ((`test`.`t9`.`b` = `test`.`t8`.`b`) or isnull(`test`.`t8`.`c`)))
 Warnings:
-Note	1003	select `test`.`t0`.`a` AS `a`,`test`.`t0`.`b` AS `b`,`test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b`,`test`.`t2`.`a` AS `a`,`test`.`t2`.`b` AS `b`,`test`.`t3`.`a` AS `a`,`test`.`t3`.`b` AS `b`,`test`.`t4`.`a` AS `a`,`test`.`t4`.`b` AS `b`,`test`.`t5`.`a` AS `a`,`test`.`t5`.`b` AS `b`,`test`.`t6`.`a` AS `a`,`test`.`t6`.`b` AS `b`,`test`.`t7`.`a` AS `a`,`test`.`t7`.`b` AS `b`,`test`.`t8`.`a` AS `a`,`test`.`t8`.`b` AS `b`,`test`.`t9`.`a` AS `a`,`test`.`t9`.`b` AS `b` from `test`.`t0` join `test`.`t1` left join (`test`.`t2` left join (`test`.`t3` join `test`.`t4`) on(((`test`.`t4`.`b` = `test`.`t2`.`b`) and (`test`.`t3`.`a` = 1))) join `test`.`t5` left join (`test`.`t6` join `test`.`t7` left join `test`.`t8` on(((`test`.`t8`.`b` = `test`.`t5`.`b`) and (`test`.`t6`.`b` < 10)))) on(((`test`.`t7`.`b` = `test`.`t5`.`b`) and (`test`.`t6`.`b` >= 2)))) on((((`test`.`t3`.`b` = 2) or isnull(`test`.`t3`.`c`)) and ((`test`.`t6`.`b` = 2) or isnull(`test`.`t6`.`c`)) and ((`test`.`t5`.`b` = `test`.`t0`.`b`) or isnull(`test`.`t3`.`c`) or isnull(`test`.`t6`.`c`) or isnull(`test`.`t8`.`c`)) and (`test`.`t1`.`a` <> 2))) join `test`.`t9` where ((`test`.`t9`.`a` = 1) and (`test`.`t1`.`b` = `test`.`t0`.`b`) and (`test`.`t0`.`a` = 1) and ((`test`.`t2`.`a` >= 4) or isnull(`test`.`t2`.`c`)) and ((`test`.`t3`.`a` < 5) or isnull(`test`.`t3`.`c`)) and ((`test`.`t4`.`b` = `test`.`t3`.`b`) or isnull(`test`.`t3`.`c`) or isnull(`test`.`t4`.`c`)) and ((`test`.`t5`.`a` >= 2) or isnull(`test`.`t5`.`c`)) and ((`test`.`t6`.`a` >= 4) or isnull(`test`.`t6`.`c`)) and ((`test`.`t7`.`a` <= 2) or isnull(`test`.`t7`.`c`)) and ((`test`.`t8`.`a` < 1) or isnull(`test`.`t8`.`c`)) and ((`test`.`t9`.`b` = `test`.`t8`.`b`) or isnull(`test`.`t8`.`c`)))
 CREATE INDEX idx_b ON t4(b);
 CREATE INDEX idx_b ON t5(b);
 EXPLAIN EXTENDED
 
=== modified file 'tests/r/join_outer.result'
--- tests/r/join_outer.result	2010-02-15 18:29:31 +0000
+++ tests/r/join_outer.result	2010-08-22 01:04:46 +0000
@@ -462,19 +462,19 @@
 7	green
 select * from t2 natural join t1;
 color	count	name
+black	5	grape
 green	10	lime
 green	7	lime
-black	5	grape
 select t2.count, t1.name from t2 natural join t1;
 count	name
 10	lime
+5	grape
 7	lime
-5	grape
 select t2.count, t1.name from t2 inner join t1 using (color);
 count	name
 10	lime
+5	grape
 7	lime
-5	grape
 drop table t1;
 drop table t2;
 CREATE TABLE t1 (
 
=== modified file 'tests/r/key_diff.result'
--- tests/r/key_diff.result	2008-12-06 22:41:03 +0000
+++ tests/r/key_diff.result	2010-08-22 01:04:46 +0000
@@ -9,30 +9,30 @@
 select * from t1,t1 as t2;
 a	b	a	b
 A	B	A	B
-b	A	A	B
+A	B	C	c
+A	B	D	E
+A	B	a	a
+A	B	b	A
 C	c	A	B
+C	c	C	c
+C	c	D	E
+C	c	a	a
+C	c	b	A
 D	E	A	B
+D	E	C	c
+D	E	D	E
+D	E	a	a
+D	E	b	A
 a	a	A	B
-A	B	b	A
-b	A	b	A
-C	c	b	A
-D	E	b	A
+a	a	C	c
+a	a	D	E
+a	a	a	a
 a	a	b	A
-A	B	C	c
+b	A	A	B
 b	A	C	c
-C	c	C	c
-D	E	C	c
-a	a	C	c
-A	B	D	E
 b	A	D	E
-C	c	D	E
-D	E	D	E
-a	a	D	E
-A	B	a	a
 b	A	a	a
-C	c	a	a
-D	E	a	a
-a	a	a	a
+b	A	b	A
 explain select t1.*,t2.* from t1,t1 as t2 where t1.A=t2.B;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	ALL	a	NULL	NULL	NULL	5	
 
=== modified file 'tests/r/range.result'
--- tests/r/range.result	2010-08-09 16:31:29 +0000
+++ tests/r/range.result	2010-08-22 01:04:46 +0000
@@ -694,8 +694,8 @@
 v.oxrootid ='d8c4177d09f8b11f5.52725521' AND
 s.oxleft > v.oxleft AND s.oxleft < v.oxright;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	#	ALL	OXLEFT	NULL	NULL	#	#	Range checked for each record (index map: 0x4)
 1	SIMPLE	#	ALL	OXLEFT,OXRIGHT,OXROOTID	NULL	NULL	#	#	Using where
-1	SIMPLE	#	ALL	OXLEFT	NULL	NULL	#	#	Range checked for each record (index map: 0x4)
 SELECT s.oxid FROM t1 v, t1 s 
 WHERE s.oxrootid = 'd8c4177d09f8b11f5.52725521' AND
 v.oxrootid ='d8c4177d09f8b11f5.52725521' AND
 
=== modified file 'tests/r/select.result'
--- tests/r/select.result	2010-08-19 20:36:05 +0000
+++ tests/r/select.result	2010-08-22 01:04:46 +0000
@@ -1272,29 +1272,29 @@
 select t2.fld1,t22.fld1 from t2,t2 t22 where t2.fld1 >= 250501 and t2.fld1 <= 250505 and t22.fld1 >= 250501 and t22.fld1 <= 250505;
 fld1	fld1
 250501	250501
[phone]
[phone]
[phone]
[phone]
 250502	250501
[phone]
[phone]
[phone]
[phone]
 250503	250501
[phone]
[phone]
[phone]
[phone]
 250504	250501
[phone]
[phone]
[phone]
[phone]
 250505	250501
-250501	250502
-250502	250502
-250503	250502
-250504	250502
 250505	250502
-250501	250503
-250502	250503
-250503	250503
-250504	250503
 250505	250503
-250501	250504
-250502	250504
-250503	250504
-250504	250504
 250505	250504
-250501	250505
-250502	250505
-250503	250505
-250504	250505
 250505	250505
 insert into t2 (fld1, companynr) values (999999,99);
 select t2.companynr,companyname from t2 left join t4 using (companynr) where t4.companynr is null;
@@ -2014,13 +2014,13 @@
 select * from (t1 as t2 left join t1 as t3 using (a)), t1;
 a	a
 1	1
+1	2
+1	3
 2	1
+2	2
+2	3
 3	1
-1	2
-2	2
 3	2
-1	3
-2	3
 3	3
 select * from t1, (t1 as t2 left join t1 as t3 using (a));
 a	a
 
=== modified file 'tests/r/subselect.result'
--- tests/r/subselect.result	2010-08-19 20:36:05 +0000
+++ tests/r/subselect.result	2010-08-22 01:04:46 +0000
@@ -4526,8 +4526,8 @@
 SELECT * FROM t1 JOIN  (t1 t1a)  ON 1;
 a	a
 1	1
+1	2
 2	1
-1	2
 2	2
 SELECT * FROM t1 JOIN ((t1 t1a)) ON 1;
 a	a
 
=== modified file 'tests/r/type_blob.result'
--- tests/r/type_blob.result	2010-07-27 00:57:00 +0000
+++ tests/r/type_blob.result	2010-08-22 01:04:46 +0000
@@ -46,13 +46,13 @@
 select * from t1,t1 as t2;
 nr	b	str	nr	b	str
 1	a	A	1	a	A
+1	a	A	2	bbb	BBB
+1	a	A	3	ccc	CCC
 2	bbb	BBB	1	a	A
+2	bbb	BBB	2	bbb	BBB
+2	bbb	BBB	3	ccc	CCC
 3	ccc	CCC	1	a	A
-1	a	A	2	bbb	BBB
-2	bbb	BBB	2	bbb	BBB
 3	ccc	CCC	2	bbb	BBB
-1	a	A	3	ccc	CCC
-2	bbb	BBB	3	ccc	CCC
 3	ccc	CCC	3	ccc	CCC
 drop table t1;
 create table t1 (a text);
 
=== modified file 'tests/r/type_datetime.result'
--- tests/r/type_datetime.result	2010-07-28 23:57:35 +0000
+++ tests/r/type_datetime.result	2010-08-22 01:04:46 +0000
@@ -268,10 +268,10 @@
 select f1,f2,f3 from t1,t2,t3 where (f1,'1') in ((f2,'1'),(f3,'1'));
 f1	f2	f3
 2001-01-01	2001-01-01 00:00:00	2001-01-01 00:00:00
[phone]-01 00:00:00	2001-02-03 12:34:56
[phone]-01 00:00:00	2002-04-06 11:22:33
 2001-01-01	2001-02-03 12:34:56	2001-01-01 00:00:00
 2001-01-01	2002-04-06 11:22:33	2001-01-01 00:00:00
-2001-01-01	2001-01-01 00:00:00	2001-02-03 12:34:56
-2001-01-01	2001-01-01 00:00:00	2002-04-06 11:22:33
 select f1 from t1 where ('1',f1) in (('1','01-01-01'),('1','2001-1-1 0:0:0'),('1','02-02-02'));
 f1
 2001-01-01
 
=== modified file 'tests/t/derived.test'
--- tests/t/derived.test	2009-08-04 02:33:47 +0000
+++ tests/t/derived.test	2010-08-22 01:04:46 +0000
@@ -27,6 +27,7 @@
 SELECT 1 FROM (SELECT 1) a WHERE a=2;
 --error 1054
 SELECT (SELECT 1) as a FROM (SELECT 1 FROM t1  HAVING a=1) as a;
+--sort_result
 select * from t1 as x1, (select * from t1) as x2;
 explain select * from t1 as x1, (select * from t1) as x2;
 drop table if exists  t2,t3;
@@ -116,12 +117,14 @@
 create table t1 (E1 INTEGER NOT NULL, E2 INTEGER NOT NULL, E3 INTEGER NOT NULL, PRIMARY KEY(E1)
 );
 insert into t1 VALUES(1,1,1), (2,2,1);
+--sort_result
 select count(*) from t1 INNER JOIN (SELECT A.E1, A.E2, A.E3 FROM t1 AS A WHERE A.E3 = (SELECT MAX(B.E3) FROM t1 AS B WHERE A.E2 = B.E2)) AS THEMAX ON t1.E1 = THEMAX.E2 AND t1.E1 = t1.E2;
 explain select count(*) from t1 INNER JOIN (SELECT A.E1, A.E2, A.E3 FROM t1 AS A WHERE A.E3 = (SELECT MAX(B.E3) FROM t1 AS B WHERE A.E2 = B.E2)) AS THEMAX ON t1.E1 = THEMAX.E2 AND t1.E1 = t1.E2;
 drop table t1;
 
 create table t1 (a int);
 insert into t1 values (1),(2);
+--sort_result
 select * from ( select * from t1 union select * from t1) a,(select * from t1 union select * from t1) b;
 explain select * from ( select * from t1 union select * from t1) a,(select * from t1 union select * from t1) b;
 drop table t1;
 
=== modified file 'tests/t/distinct.test'
--- tests/t/distinct.test	2010-02-15 18:29:31 +0000
+++ tests/t/distinct.test	2010-08-22 01:04:46 +0000
@@ -235,6 +235,7 @@
       (1, 'Z001'),
       (2, 'R002');
 
+--sorted_result
 SELECT DISTINCTROW email, shipcode FROM t1, t2 WHERE t1.infoID=t2.infoID;
 SELECT DISTINCTROW email FROM t1 ORDER BY dateentered DESC;
 SELECT DISTINCTROW email, shipcode FROM t1, t2 WHERE t1.infoID=t2.infoID ORDER BY dateentered DESC;
@@ -345,6 +346,7 @@
 EXPLAIN SELECT DISTINCT a FROM t1;
 EXPLAIN SELECT DISTINCT a,b FROM t1;
 EXPLAIN SELECT DISTINCT t1_1.a, t1_1.b FROM t1 t1_1, t1 t1_2;
+--sorted_result
 EXPLAIN SELECT DISTINCT t1_1.a, t1_1.b FROM t1 t1_1, t1 t1_2
   WHERE t1_1.a = t1_2.a;
 EXPLAIN SELECT a FROM t1 GROUP BY a;
 
=== modified file 'tests/t/func_group.test'
--- tests/t/func_group.test	2010-08-18 21:57:15 +0000
+++ tests/t/func_group.test	2010-08-22 01:04:46 +0000
@@ -128,6 +128,7 @@
 
 insert into t2 values('AAA', 10, 0.5);
 insert into t2 values('BBB', 20, 1.0);
+--sorted_result
 select t1.a1, t1.a2, t2.a1, t2.a2 from t1,t2;
 
 select max(t1.a1), max(t2.a1) from t1, t2 where t2.a2=9;
@@ -629,6 +630,7 @@
 CREATE TABLE t2 (a INT PRIMARY KEY, b INT);
 INSERT INTO t2 VALUES (1,1), (3,3);
 
+--sorted_result
 SELECT 
   (SELECT SUM(c.a) FROM t1 ttt, t2 ccc 
    WHERE ttt.a = ccc.b AND ttt.a = t.a GROUP BY ttt.a) AS minid   
 
=== modified file 'tests/t/func_in.test'
--- tests/t/func_in.test	2009-07-03 13:13:20 +0000
+++ tests/t/func_in.test	2010-08-22 01:04:46 +0000
@@ -262,6 +262,7 @@
 INSERT INTO t4 VALUES (1,1),(2,2),(1000,1000),(1001,1001),(1002,1002),
        (1003,1003),(1004,1004);
 
+--sorted_result
 EXPLAIN SELECT STRAIGHT_JOIN * FROM t3 
   JOIN t1 ON t3.a=t1.a 
   JOIN t2 ON t3.a=t2.a
@@ -272,6 +273,7 @@
   JOIN t2 ON t3.a=t2.a
   JOIN t4 WHERE t4.a IN (t1.b, t2.b);
 
+--sorted_result
 EXPLAIN SELECT STRAIGHT_JOIN 
    (SELECT SUM(t4.a) FROM t4 WHERE t4.a IN (t1.b, t2.b)) 
   FROM t3, t1, t2
 
=== modified file 'tests/t/func_time.test'
--- tests/t/func_time.test	2009-06-16 00:53:22 +0000
+++ tests/t/func_time.test	2010-08-22 01:04:46 +0000
@@ -498,9 +498,11 @@
 INSERT INTO t2 VALUES
   (1, '2005-08-01'), (2, '2005-06-15'), (3, '2005-07-15');
 
+--sorted_result
 SELECT * FROM t1, t2 
   WHERE t1.day BETWEEN 
                '2005.09.01' - INTERVAL 6 MONTH AND t2.day;
+--sorted_result
 SELECT * FROM t1, t2 
   WHERE CAST(t1.day AS DATE) BETWEEN 
                              '2005.09.01' - INTERVAL 6 MONTH AND t2.day;
 
=== modified file 'tests/t/greedy_optimizer.test'
--- tests/t/greedy_optimizer.test	2010-02-15 18:29:31 +0000
+++ tests/t/greedy_optimizer.test	2010-08-22 01:04:46 +0000
@@ -173,18 +173,23 @@
 # 6-table join, chain
 explain select t1.c11 from t1, t2, t3, t4, t5, t6, t7 where t1.c12 = t2.c21 and t2.c22 = t3.c31 and t3.c32 = t4.c41 and t4.c42 = t5.c51 and t5.c52 = t6.c61 and t6.c62 = t7.c71;
 --replace_column 2 #
+--sorted_result
 show status like 'Last_query_cost';
 explain select t1.c11 from t7, t6, t5, t4, t3, t2, t1 where t1.c12 = t2.c21 and t2.c22 = t3.c31 and t3.c32 = t4.c41 and t4.c42 = t5.c51 and t5.c52 = t6.c61 and t6.c62 = t7.c71;
 --replace_column 2 #
+--sorted_result
 show status like 'Last_query_cost';
 # 6-table join, star
+--sorted_result
 explain select t1.c11 from t1, t2, t3, t4, t5, t6, t7 where t1.c11 = t2.c21 and t1.c12 = t3.c31 and t1.c13 = t4.c41 and t1.c14 = t5.c51 and t1.c15 = t6.c61 and t1.c16 = t7.c71;
 --replace_column 2 #
 show status like 'Last_query_cost';
+--sorted_result
 explain select t1.c11 from t7, t6, t5, t4, t3, t2, t1 where t1.c11 = t2.c21 and t1.c12 = t3.c31 and t1.c13 = t4.c41 and t1.c14 = t5.c51 and t1.c15 = t6.c61 and t1.c16 = t7.c71;
 --replace_column 2 #
 show status like 'Last_query_cost';
 # 6-table join, clique
+--sorted_result
 explain select t1.c11 from t1, t2, t3, t4, t5, t6, t7 where t1.c11 = t2.c21 and t1.c12 = t3.c31 and t1.c13 = t4.c41 and t1.c14 = t5.c51 and t1.c15 = t6.c61 and t1.c16 = t7.c71 and t2.c22 = t3.c32 and t2.c23 = t4.c42 and t2.c24 = t5.c52 and t2.c25 = t6.c62 and t2.c26 = t7.c72 and t3.c33 = t4.c43 and t3.c34 = t5.c53 and t3.c35 = t6.c63 and t3.c36 = t7.c73 and t4.c42 = t5.c54 and t4.c43 = t6.c64 and t4.c44 = t7.c74 and t5.c52 = t6.c65 and t5.c53 = t7.c75 and t6.c62 = t7.c76;
 --replace_column 2 #
 show status like 'Last_query_cost';
@@ -202,6 +207,7 @@
 select @@optimizer_search_depth;
 
 # 6-table join, chain
+--sorted_result
 explain select t1.c11 from t1, t2, t3, t4, t5, t6, t7 where t1.c12 = t2.c21 and t2.c22 = t3.c31 and t3.c32 = t4.c41 and t4.c42 = t5.c51 and t5.c52 = t6.c61 and t6.c62 = t7.c71;
 --replace_column 2 #
 show status like 'Last_query_cost';
@@ -210,15 +216,19 @@
 show status like 'Last_query_cost';
 # 6-table join, star
 --replace_column 2 #
+--sorted_result
 explain select t1.c11 from t1, t2, t3, t4, t5, t6, t7 where t1.c11 = t2.c21 and t1.c12 = t3.c31 and t1.c13 = t4.c41 and t1.c14 = t5.c51 and t1.c15 = t6.c61 and t1.c16 = t7.c71;
 --replace_column 2 #
 show status like 'Last_query_cost';
+--sorted_result
 explain select t1.c11 from t7, t6, t5, t4, t3, t2, t1 where t1.c11 = t2.c21 and t1.c12 = t3.c31 and t1.c13 = t4.c41 and t1.c14 = t5.c51 and t1.c15 = t6.c61 and t1.c16 = t7.c71;
 --replace_column 2 #
 show status like 'Last_query_cost';
+--sorted_result
 # 6-table join, clique
 explain select t1.c11 from t1, t2, t3, t4, t5, t6, t7 where t1.c11 = t2.c21 and t1.c12 = t3.c31 and t1.c13 = t4.c41 and t1.c14 = t5.c51 and t1.c15 = t6.c61 and t1.c16 = t7.c71 and t2.c22 = t3.c32 and t2.c23 = t4.c42 and t2.c24 = t5.c52 and t2.c25 = t6.c62 and t2.c26 = t7.c72 and t3.c33 = t4.c43 and t3.c34 = t5.c53 and t3.c35 = t6.c63 and t3.c36 = t7.c73 and t4.c42 = t5.c54 and t4.c43 = t6.c64 and t4.c44 = t7.c74 and t5.c52 = t6.c65 and t5.c53 = t7.c75 and t6.c62 = t7.c76;
 --replace_column 2 #
+--sorted_result
 show status like 'Last_query_cost';
 explain select t1.c11 from t7, t6, t5, t4, t3, t2, t1 where t1.c11 = t2.c21 and t1.c12 = t3.c31 and t1.c13 = t4.c41 and t1.c14 = t5.c51 and t1.c15 = t6.c61 and t1.c16 = t7.c71 and t2.c22 = t3.c32 and t2.c23 = t4.c42 and t2.c24 = t5.c52 and t2.c25 = t6.c62 and t2.c26 = t7.c72 and t3.c33 = t4.c43 and t3.c34 = t5.c53 and t3.c35 = t6.c63 and t3.c36 = t7.c73 and t4.c42 = t5.c54 and t4.c43 = t6.c64 and t4.c44 = t7.c74 and t5.c52 = t6.c65 and t5.c53 = t7.c75 and t6.c62 = t7.c76;
 --replace_column 2 #
@@ -228,22 +238,30 @@
 select @@optimizer_search_depth;
 
 # 6-table join, chain
+--sorted_result
 explain select t1.c11 from t1, t2, t3, t4, t5, t6, t7 where t1.c12 = t2.c21 and t2.c22 = t3.c31 and t3.c32 = t4.c41 and t4.c42 = t5.c51 and t5.c52 = t6.c61 and t6.c62 = t7.c71;
 --replace_column 2 #
+--sorted_result
 show status like 'Last_query_cost';
 explain select t1.c11 from t7, t6, t5, t4, t3, t2, t1 where t1.c12 = t2.c21 and t2.c22 = t3.c31 and t3.c32 = t4.c41 and t4.c42 = t5.c51 and t5.c52 = t6.c61 and t6.c62 = t7.c71;
 --replace_column 2 #
+--sorted_result
 show status like 'Last_query_cost';
 # 6-table join, star
+--sorted_result
 explain select t1.c11 from t1, t2, t3, t4, t5, t6, t7 where t1.c11 = t2.c21 and t1.c12 = t3.c31 and t1.c13 = t4.c41 and t1.c14 = t5.c51 and t1.c15 = t6.c61 and t1.c16 = t7.c71;
 --replace_column 2 #
+--sorted_result
 show status like 'Last_query_cost';
 explain select t1.c11 from t7, t6, t5, t4, t3, t2, t1 where t1.c11 = t2.c21 and t1.c12 = t3.c31 and t1.c13 = t4.c41 and t1.c14 = t5.c51 and t1.c15 = t6.c61 and t1.c16 = t7.c71;
 --replace_column 2 #
+--sorted_result
 show status like 'Last_query_cost';
 # 6-table join, clique
+--sorted_result
 explain select t1.c11 from t1, t2, t3, t4, t5, t6, t7 where t1.c11 = t2.c21 and t1.c12 = t3.c31 and t1.c13 = t4.c41 and t1.c14 = t5.c51 and t1.c15 = t6.c61 and t1.c16 = t7.c71 and t2.c22 = t3.c32 and t2.c23 = t4.c42 and t2.c24 = t5.c52 and t2.c25 = t6.c62 and t2.c26 = t7.c72 and t3.c33 = t4.c43 and t3.c34 = t5.c53 and t3.c35 = t6.c63 and t3.c36 = t7.c73 and t4.c42 = t5.c54 and t4.c43 = t6.c64 and t4.c44 = t7.c74 and t5.c52 = t6.c65 and t5.c53 = t7.c75 and t6.c62 = t7.c76;
 --replace_column 2 #
+--sorted_result
 show status like 'Last_query_cost';
 explain select t1.c11 from t7, t6, t5, t4, t3, t2, t1 where t1.c11 = t2.c21 and t1.c12 = t3.c31 and t1.c13 = t4.c41 and t1.c14 = t5.c51 and t1.c15 = t6.c61 and t1.c16 = t7.c71 and t2.c22 = t3.c32 and t2.c23 = t4.c42 and t2.c24 = t5.c52 and t2.c25 = t6.c62 and t2.c26 = t7.c72 and t3.c33 = t4.c43 and t3.c34 = t5.c53 and t3.c35 = t6.c63 and t3.c36 = t7.c73 and t4.c42 = t5.c54 and t4.c43 = t6.c64 and t4.c44 = t7.c74 and t5.c52 = t6.c65 and t5.c53 = t7.c75 and t6.c62 = t7.c76;
 --replace_column 2 #
@@ -260,16 +278,20 @@
 --replace_column 2 #
 show status like 'Last_query_cost';
 # 6-table join, star
+--sorted_result
 explain select t1.c11 from t1, t2, t3, t4, t5, t6, t7 where t1.c11 = t2.c21 and t1.c12 = t3.c31 and t1.c13 = t4.c41 and t1.c14 = t5.c51 and t1.c15 = t6.c61 and t1.c16 = t7.c71;
 --replace_column 2 #
 show status like 'Last_query_cost';
+--sorted_result
 explain select t1.c11 from t7, t6, t5, t4, t3, t2, t1 where t1.c11 = t2.c21 and t1.c12 = t3.c31 and t1.c13 = t4.c41 and t1.c14 = t5.c51 and t1.c15 = t6.c61 and t1.c16 = t7.c71;
 --replace_column 2 #
 show status like 'Last_query_cost';
 # 6-table join, clique
+--sorted_result
 explain select t1.c11 from t1, t2, t3, t4, t5, t6, t7 where t1.c11 = t2.c21 and t1.c12 = t3.c31 and t1.c13 = t4.c41 and t1.c14 = t5.c51 and t1.c15 = t6.c61 and t1.c16 = t7.c71 and t2.c22 = t3.c32 and t2.c23 = t4.c42 and t2.c24 = t5.c52 and t2.c25 = t6.c62 and t2.c26 = t7.c72 and t3.c33 = t4.c43 and t3.c34 = t5.c53 and t3.c35 = t6.c63 and t3.c36 = t7.c73 and t4.c42 = t5.c54 and t4.c43 = t6.c64 and t4.c44 = t7.c74 and t5.c52 = t6.c65 and t5.c53 = t7.c75 and t6.c62 = t7.c76;
 --replace_column 2 #
 show status like 'Last_query_cost';
+--sorted_result
 explain select t1.c11 from t7, t6, t5, t4, t3, t2, t1 where t1.c11 = t2.c21 and t1.c12 = t3.c31 and t1.c13 = t4.c41 and t1.c14 = t5.c51 and t1.c15 = t6.c61 and t1.c16 = t7.c71 and t2.c22 = t3.c32 and t2.c23 = t4.c42 and t2.c24 = t5.c52 and t2.c25 = t6.c62 and t2.c26 = t7.c72 and t3.c33 = t4.c43 and t3.c34 = t5.c53 and t3.c35 = t6.c63 and t3.c36 = t7.c73 and t4.c42 = t5.c54 and t4.c43 = t6.c64 and t4.c44 = t7.c74 and t5.c52 = t6.c65 and t5.c53 = t7.c75 and t6.c62 = t7.c76;
 --replace_column 2 #
 show status like 'Last_query_cost';
@@ -289,11 +311,14 @@
 --replace_column 2 #
 show status like 'Last_query_cost';
 # 6-table join, star
+--sorted_result
 explain select t1.c11 from t1, t2, t3, t4, t5, t6, t7 where t1.c11 = t2.c21 and t1.c12 = t3.c31 and t1.c13 = t4.c41 and t1.c14 = t5.c51 and t1.c15 = t6.c61 and t1.c16 = t7.c71;
 --replace_column 2 #
+--sorted_result
 show status like 'Last_query_cost';
 explain select t1.c11 from t7, t6, t5, t4, t3, t2, t1 where t1.c11 = t2.c21 and t1.c12 = t3.c31 and t1.c13 = t4.c41 and t1.c14 = t5.c51 and t1.c15 = t6.c61 and t1.c16 = t7.c71;
 --replace_column 2 #
+--sorted_result
 show status like 'Last_query_cost';
 # 6-table join, clique
 explain select t1.c11 from t1, t2, t3, t4, t5, t6, t7 where t1.c11 = t2.c21 and t1.c12 = t3.c31 and t1.c13 = t4.c41 and t1.c14 = t5.c51 and t1.c15 = t6.c61 and t1.c16 = t7.c71 and t2.c22 = t3.c32 and t2.c23 = t4.c42 and t2.c24 = t5.c52 and t2.c25 = t6.c62 and t2.c26 = t7.c72 and t3.c33 = t4.c43 and t3.c34 = t5.c53 and t3.c35 = t6.c63 and t3.c36 = t7.c73 and t4.c42 = t5.c54 and t4.c43 = t6.c64 and t4.c44 = t7.c74 and t5.c52 = t6.c65 and t5.c53 = t7.c75 and t6.c62 = t7.c76;
 
=== modified file 'tests/t/group_by.test'
--- tests/t/group_by.test	2010-08-19 01:24:09 +0000
+++ tests/t/group_by.test	2010-08-22 01:04:46 +0000
@@ -400,7 +400,9 @@
 insert into t2 values (1,3),(3,1),(2,2),(1,1);
 select t1.a,t2.b from t1,t2 where t1.a=t2.a group by t1.a,t2.b;
 select t1.a,t2.b from t1,t2 where t1.a=t2.a group by t1.a,t2.b ORDER BY NULL;
+--sorted_result
 explain select t1.a,t2.b from t1,t2 where t1.a=t2.a group by t1.a,t2.b;
+--sorted_result
 explain select t1.a,t2.b from t1,t2 where t1.a=t2.a group by t1.a,t2.b ORDER BY NULL;
 drop table t1,t2;
 
 
=== modified file 'tests/t/group_min_max.test'
--- tests/t/group_min_max.test	2009-11-26 02:37:40 +0000
+++ tests/t/group_min_max.test	2010-08-22 01:04:46 +0000
@@ -523,6 +523,7 @@
 # BUG #8532 - SELECT DISTINCT a, a causes server to crash
 select distinct a1,a1 from t1;
 select distinct a2,a1,a2,a1 from t1;
+--sorted_result
 select distinct t1.a1,t2.a1 from t1,t2;
 
 
 
=== modified file 'tests/t/join.test'
--- tests/t/join.test	2010-02-15 18:29:31 +0000
+++ tests/t/join.test	2010-08-22 01:04:46 +0000
@@ -248,6 +248,7 @@
   PRIMARY KEY  (id)
 ) ENGINE=MyISAM;
 INSERT INTO t2 VALUES (1,'s1'),(2,'s2'),(3,'s3'),(4,'s4'),(5,'s5');
+--sorted_result
 select t1.*, t2.*  from t1, t2 where t2.id=t1.t2_id limit 2;
 drop table t1,t2;
 
@@ -400,9 +401,11 @@
 from t1 join (t2 join t4 on b + 1 = y) on t1.c = t4.c;
 
 # Views with bigger natural join
+--sorted_result
 select * from t1 natural join (t2 natural join t3);
 
 # Nested natural/using joins.
+--sorted_result
 select * from (t1 natural join t2) natural join (t3 natural join t4);
 select * from (t1 natural join t2) natural left join (t3 natural join t4);
 select * from (t3 natural join t4) natural right join (t1 natural join t2);
@@ -443,11 +446,14 @@
 select * from t1 join (t2 join t4 on b + 1 = y) on t1.c = t4.c;
 select * from (t2 join t4 on b + 1 = y) join t1 on t1.c = t4.c;
 select * from t1 natural join (t2 join t4 on b + 1 = y);
+--sorted_result
 select * from (t1 cross join t2) join (t3 cross join t4) on (a < y and t2.b < t3.c);
 
 # MySQL extension - 'join ... on' over nested comma operator
+--sorted_result
 select * from (t1, t2) join (t3, t4) on (a < y and t2.b < t3.c);
 select * from (t1 natural join t2) join (t3 natural join t4) on a = y;
+--sorted_result
 select * from ((t3 join (t1 join t2 on c > a) on t3.b < t2.a) join t4 on y > t1.c) join t5 on z = t1.b + 3;
 
 # MySQL extension - refererence qualified coalesced columns
@@ -456,6 +462,7 @@
 select * from (t4 natural join t5) natural join t1 where t4.y > 7;
 select * from t1 natural left join (t4 natural join t5) where t4.y > 7;
 select * from (t4 natural join t5) natural right join t1 where t4.y > 7;
+--sorted_result
 select * from (t1 natural join t2) join (t3 natural join t4) on t1.b = t3.b;
 
 # MySQL extension - select qualified columns of NJ columns
 
=== modified file 'tests/t/join_nested.test'
--- tests/t/join_nested.test	2008-12-06 22:41:03 +0000
+++ tests/t/join_nested.test	2010-08-22 01:04:46 +0000
@@ -35,6 +35,7 @@
 SELECT t4.a,t4.b
   FROM t4;
 
+--sorted_result
 SELECT t3.a,t3.b,t4.a,t4.b
   FROM t3,t4;
 
@@ -75,6 +76,7 @@
 SELECT t5.a,t5.b
   FROM t5;
 
+--sorted_result
 SELECT t3.a,t3.b,t4.a,t4.b,t5.a,t5.b
   FROM t3,t4,t5;
 
@@ -122,12 +124,14 @@
 SELECT t7.a,t7.b
   FROM t7;
 
+--sorted_result
 SELECT t6.a,t6.b,t7.a,t7.b
   FROM t6,t7;
 
 SELECT t8.a,t8.b
   FROM t8;
 
+--sorted_result
 EXPLAIN EXTENDED
 SELECT t6.a,t6.b,t7.a,t7.b,t8.a,t8.b
   FROM (t6, t7)
@@ -155,6 +159,7 @@
        )
        ON t6.b >= 2 AND t5.b=t7.b;
 
+--select_sorted
 SELECT t5.a,t5.b,t6.a,t6.b,t7.a,t7.b,t8.a,t8.b
   FROM t5 
        LEFT JOIN 
@@ -189,6 +194,7 @@
        )
        ON t6.b >= 2 AND t5.b=t7.b; 
 
+--sorted_result
 SELECT t2.a,t2.b,t3.a,t3.b,t4.a,t4.b,
        t5.a,t5.b,t6.a,t6.b,t7.a,t7.b,t8.a,t8.b
   FROM t2
@@ -313,6 +319,7 @@
           t0.b=t1.b AND          
           (t2.a >= 4 OR t2.c IS NULL); 
 
+--sorted_result
 EXPLAIN EXTENDED
 SELECT t0.a,t0.b,t1.a,t1.b,t2.a,t2.b,t3.a,t3.b,t4.a,t4.b,
        t5.a,t5.b,t6.a,t6.b,t7.a,t7.b,t8.a,t8.b,t9.a,t9.b
@@ -402,6 +409,7 @@
        t3
        ON t2.b=t3.b;
 
+--sorted_result
 SELECT t1.a,t1.b,t2.a,t2.b,t3.a,t3.b
   FROM t1, t2 
        LEFT JOIN              
@@ -409,6 +417,7 @@
        ON t2.b=t3.b
     WHERE t1.a <= 2;
 
+--sorted_result
 SELECT t1.a,t1.b,t2.a,t2.b,t3.a,t3.b
   FROM t1, t3 
        RIGHT JOIN              
@@ -425,6 +434,7 @@
        (t3, t4)
        ON t3.a=1 AND t2.b=t4.b;
 
+--sorted_result
 SELECT t1.a,t1.b,t2.a,t2.b,t3.a,t3.b,t4.a,t4.b
   FROM t1, t2 
        LEFT JOIN              
@@ -432,6 +442,7 @@
        ON t3.a=1 AND t2.b=t4.b
     WHERE t1.a <= 2;
 
+--sorted_result
 SELECT t1.a,t1.b,t2.a,t2.b,t3.a,t3.b,t4.a,t4.b
   FROM t1, (t3, t4) 
        RIGHT JOIN              
@@ -456,6 +467,7 @@
 
 CREATE INDEX idx_b ON t2(b);
 
+--sorted_result
 EXPLAIN EXTENDED
 SELECT t2.a,t2.b,t3.a,t3.b,t4.a,t4.b
   FROM (t3,t4)
@@ -469,6 +481,7 @@
        (t1,t2)
        ON t3.a=1 AND t3.b=t2.b AND t2.b=t4.b;
 
+--sorted_result
 EXPLAIN EXTENDED
 SELECT t0.a,t0.b,t1.a,t1.b,t2.a,t2.b,t3.a,t3.b,t4.a,t4.b,
        t5.a,t5.b,t6.a,t6.b,t7.a,t7.b,t8.a,t8.b,t9.a,t9.b
 
=== modified file 'tests/t/join_outer.test'
--- tests/t/join_outer.test	2010-02-15 18:29:31 +0000
+++ tests/t/join_outer.test	2010-08-22 01:04:46 +0000
@@ -344,8 +344,11 @@
 insert into t2 values (7, 'green');
 select * from t1;
 select * from t2;
+--sorted_result
 select * from t2 natural join t1;
+--sorted_result
 select t2.count, t1.name from t2 natural join t1;
+--sorted_result
 select t2.count, t1.name from t2 inner join t1 using (color);
 drop table t1;
 drop table t2;
 
=== modified file 'tests/t/key_diff.test'
--- tests/t/key_diff.test	2008-12-06 22:41:03 +0000
+++ tests/t/key_diff.test	2010-08-22 01:04:46 +0000
@@ -14,6 +14,7 @@
 
 INSERT INTO t1 VALUES ('A','B'),('b','A'),('C','c'),('D','E'),('a','a');
 
+--sorted_result
 select * from t1,t1 as t2;
 explain select t1.*,t2.* from t1,t1 as t2 where t1.A=t2.B;
 #select t1.*,t2.* from t1,t1 as t2 where t1.A=t2.B;
 
=== modified file 'tests/t/range.test'
--- tests/t/range.test	2010-05-20 06:32:31 +0000
+++ tests/t/range.test	2010-08-22 01:04:46 +0000
@@ -556,6 +556,7 @@
  'd8c4177d09f8b11f5.52725521');
 
 --replace_column 3 # 8 # 9 #
+--sorted_result
 EXPLAIN
 SELECT s.oxid FROM t1 v, t1 s 
   WHERE s.oxrootid = 'd8c4177d09f8b11f5.52725521' AND
 
=== modified file 'tests/t/select.test'
--- tests/t/select.test	2010-04-03 07:02:51 +0000
+++ tests/t/select.test	2010-08-22 01:04:46 +0000
@@ -1535,6 +1535,7 @@
 #
 
 select * from t1,t1 t12;
+--sorted_result
 select t2.fld1,t22.fld1 from t2,t2 t22 where t2.fld1 >= 250501 and t2.fld1 <= 250505 and t22.fld1 >= 250501 and t22.fld1 <= 250505;
 
 #
@@ -1828,6 +1829,7 @@
 insert into t1 values ();
 insert into t1 values ();
 # ,
+--sorted_result
 select * from (t1 as t2 left join t1 as t3 using (a)), t1;
 select * from t1, (t1 as t2 left join t1 as t3 using (a));
 # stright_join
 
=== modified file 'tests/t/subselect.test'
--- tests/t/subselect.test	2010-03-03 20:57:45 +0000
+++ tests/t/subselect.test	2010-08-22 01:04:46 +0000
@@ -3119,6 +3119,7 @@
 --error ER_PARSE_ERROR
 SELECT * FROM t1 JOIN ((t1 t1a)) t1a ON 1;
 
+--sorted_result
 SELECT * FROM t1 JOIN  (t1 t1a)  ON 1;
 SELECT * FROM t1 JOIN ((t1 t1a)) ON 1;
 
 
=== modified file 'tests/t/type_blob.test'
--- tests/t/type_blob.test	2009-06-16 00:46:49 +0000
+++ tests/t/type_blob.test	2010-08-22 01:04:46 +0000
@@ -54,6 +54,7 @@
 insert into t1 values (null,"bbb","BBB");
 insert into t1 values (null,"ccc","CCC");
 select last_insert_id();
+--sorted_result
 select * from t1,t1 as t2;
 
 drop table t1;
 
=== modified file 'tests/t/type_datetime.test'
--- tests/t/type_datetime.test	2010-02-03 21:54:38 +0000
+++ tests/t/type_datetime.test	2010-08-22 01:04:46 +0000
@@ -231,6 +231,7 @@
 create table t3(f3 varchar(20));
 insert into t3 select * from t2;
 select * from t2,t3 where f2 in (f3,'03-04-05');
+--sorted_result
 select f1,f2,f3 from t1,t2,t3 where (f1,'1') in ((f2,'1'),(f3,'1'));
 select f1 from t1 where ('1',f1) in (('1','01-01-01'),('1','2001-1-1 0:0:0'),('1','02-02-02'));
 drop table t1,t2,t3;