mariadb/storage/pbxt/mysql-test/main/r/join.rdiff

--- r/join.result	2012-01-09 16:13:21.000000000 +0100
+++ r/join.reject	2012-02-10 16:06:39.000000000 +0100
@@ -872,7 +872,7 @@
 insert into t3 select * from t2 where a < 800;
 explain select * from t2,t3 where t2.a < 200 and t2.b=t3.b;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t2	ALL	a,b	NULL	NULL	NULL	1000	Using where
+1	SIMPLE	t2	range	a,b	a	5	NULL	1	Using where
 1	SIMPLE	t3	ref	b	b	5	test.t2.b	1	
 drop table t1, t2, t3;
 create table t1 (a int);
@@ -884,7 +884,7 @@
 1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	10	
 show status like '%cost%';
 Variable_name	Value
-Last_query_cost	4.016090
+Last_query_cost	4.262158
 select 'The cost of accessing t1 (dont care if it changes' '^';
 The cost of accessing t1 (dont care if it changes
 The cost of accessing t1 (dont care if it changes^
@@ -898,7 +898,7 @@
 1	SIMPLE	B	eq_ref	PRIMARY	PRIMARY	4	test.A.b	1	
 show status like '%cost%';
 Variable_name	Value
-Last_query_cost	28.016090
+Last_query_cost	28.262158
 select '^^: The above should be ~= 20 + cost(select * from t1). Value less than 20 is an error' Z;
 Z
 ^^: The above should be ~= 20 + cost(select * from t1). Value less than 20 is an error
@@ -1099,7 +1099,7 @@
 ON t1.a = t3.a;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	3	
-1	SIMPLE	t3	ref	a	a	5	test.t1.a	2	Using where; Using index
+1	SIMPLE	t3	ref	a	a	5	test.t1.a	1	Using where; Using index
 1	SIMPLE	t4	ALL	NULL	NULL	NULL	NULL	0	Using where
 1	SIMPLE	t5	ALL	NULL	NULL	NULL	NULL	0	Using where
 1	SIMPLE	t6	ALL	NULL	NULL	NULL	NULL	0	Using where
@@ -1253,10 +1253,12 @@
 INSERT INTO t2 VALUES (1,NULL);
 EXPLAIN SELECT * FROM t1 JOIN t2 ON t1.v = t2.v ORDER BY 1;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
+1	SIMPLE	t2	ALL	ix2	NULL	NULL	NULL	1	Using where; Using temporary; Using filesort
+1	SIMPLE	t1	ref	ix1	ix1	5	test.t2.v	1	
 EXPLAIN SELECT * FROM t1 JOIN t2 ON t1.v = t2.v;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
+1	SIMPLE	t2	ALL	ix2	NULL	NULL	NULL	1	Using where
+1	SIMPLE	t1	ref	ix1	ix1	5	test.t2.v	1	
 INSERT INTO t1 VALUES (3,'b'),(4,NULL),(5,'c'),(6,'cc'),(7,'d'),
 (8,'dd'),(9,'e'),(10,'ee');
 INSERT INTO t2 VALUES (2,NULL);
@@ -1268,7 +1270,7 @@
 Handler_read_first	0
 Handler_read_key	1
 Handler_read_last	0
-Handler_read_next	0
+Handler_read_next	2
 Handler_read_prev	0
 Handler_read_rnd	0
 Handler_read_rnd_next	1