new EXPLAIN

fixed bug in mysql-test/create-test-result
fixed bug in union-subselect engine


mysql-test/create-test-result:
  fixed bug in reject file name assembling
mysql-test/r/compare.result:
  new EXPLAIN
mysql-test/r/create.result:
  new EXPLAIN
mysql-test/r/distinct.result:
  new EXPLAIN
mysql-test/r/explain.result:
  new EXPLAIN
mysql-test/r/group_by.result:
  new EXPLAIN
mysql-test/r/heap.result:
  new EXPLAIN
mysql-test/r/heap_btree.result:
  new EXPLAIN
mysql-test/r/heap_hash.result:
  new EXPLAIN
mysql-test/r/innodb.result:
  new EXPLAIN
mysql-test/r/join_outer.result:
  new EXPLAIN
mysql-test/r/key_diff.result:
  new EXPLAIN
mysql-test/r/key_primary.result:
  new EXPLAIN
mysql-test/r/merge.result:
  new EXPLAIN
mysql-test/r/myisam.result:
  new EXPLAIN
mysql-test/r/null_key.result:
  new EXPLAIN
mysql-test/r/odbc.result:
  new EXPLAIN
mysql-test/r/order_by.result:
  new EXPLAIN
mysql-test/r/range.result:
  new EXPLAIN
mysql-test/r/select.result:
  new EXPLAIN
mysql-test/r/subselect.result:
  new EXPLAIN
mysql-test/r/type_datetime.result:
  new EXPLAIN
mysql-test/r/union.result:
  new EXPLAIN
mysql-test/r/user_var.result:
  new EXPLAIN
mysql-test/r/varbinary.result:
  new EXPLAIN
mysql-test/t/subselect.test:
  new EXPLAIN
mysql-test/t/union.test:
  new EXPLAIN
sql/mysql_priv.h:
  new EXPLAIN
sql/sql_class.cc:
  new EXPLAIN
sql/sql_class.h:
  new EXPLAIN
sql/sql_derived.cc:
  new EXPLAIN
sql/sql_lex.h:
  new EXPLAIN
sql/sql_parse.cc:
  new EXPLAIN
sql/sql_select.cc:
  new EXPLAIN
sql/sql_union.cc:
  fixed bug in subselect-UNION engine
sql/table.h:
  new EXPLAIN

1 files changed, 21 insertions, 21 deletions

diff --git a/mysql-test/r/heap_btree.result b/mysql-test/r/heap_btree.result
index c3080389999..5a8289a16f7 100644
--- a/mysql-test/r/heap_btree.result
+++ b/mysql-test/r/heap_btree.result
@@ -65,8 +65,8 @@ a
 869751
 alter table t1 type=myisam;
 explain select * from t1 where a in (869751,736494,226312,802616);
-table	type	possible_keys	key	key_len	ref	rows	Extra
-t1	range	uniq_id	uniq_id	4	NULL	4	where used; Using index
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	FIRST	t1	range	uniq_id	uniq_id	4	NULL	4	where used; Using index
 drop table t1;
 create table t1 (x int not null, y int not null, key x  using BTREE (x), unique y  using BTREE (y))
 type=heap;
@@ -84,9 +84,9 @@ x	y	x	y
 2	5	2	2
 2	6	2	2
 explain select * from t1,t1 as t2 where t1.x=t2.y;
-table	type	possible_keys	key	key_len	ref	rows	Extra
-t1	ALL	x	NULL	NULL	NULL	6	
-t2	eq_ref	y	y	4	t1.x	1	
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	FIRST	t1	ALL	x	NULL	NULL	NULL	6	
+1	FIRST	t2	eq_ref	y	y	4	t1.x	1	
 drop table t1;
 create table t1 (a int) type=heap;
 insert into t1 values(1);
@@ -120,18 +120,18 @@ a	b
 1	6
 1	6
 explain select * from tx where a=x order by a,b;
-table	type	possible_keys	key	key_len	ref	rows	Extra
-tx	ref	a	a	x	const	x	where used
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+x	FIRST	tx	ref	a	a	x	const	x	where used
 explain select * from tx where a=x order by b;
-table	type	possible_keys	key	key_len	ref	rows	Extra
-tx	ref	a	a	x	const	x	where used
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+x	FIRST	tx	ref	a	a	x	const	x	where used
 select * from t1 where b=1;
 a	b
 1	1
 1	1
 explain select * from tx where b=x;
-table	type	possible_keys	key	key_len	ref	rows	Extra
-tx	ref	b	b	x	const	x	where used
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+x	FIRST	tx	ref	b	b	x	const	x	where used
 drop table t1;
 create table t1 (id int unsigned not null, primary key  using BTREE (id)) type=HEAP;
 insert into t1 values(1);
@@ -171,18 +171,18 @@ drop table t1;
 create table t1 (btn char(10) not null, key using BTREE (btn)) type=heap;
 insert into t1 values ("hello"),("hello"),("hello"),("hello"),("hello"),("a"),("b"),("c"),("d"),("e"),("f"),("g"),("h"),("i");
 explain select * from t1 where btn like "q%";
-table	type	possible_keys	key	key_len	ref	rows	Extra
-t1	ALL	btn	NULL	NULL	NULL	14	where used
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	FIRST	t1	ALL	btn	NULL	NULL	NULL	14	where used
 select * from t1 where btn like "q%";
 btn
 alter table t1 add column new_col char(1) not null, add key using BTREE (btn,new_col), drop key btn;
 update t1 set new_col=btn;
 explain select * from t1 where btn="a";
-table	type	possible_keys	key	key_len	ref	rows	Extra
-t1	ref	btn	btn	10	const	1	where used
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	FIRST	t1	ref	btn	btn	10	const	1	where used
 explain select * from t1 where btn="a" and new_col="a";
-table	type	possible_keys	key	key_len	ref	rows	Extra
-t1	ref	btn	btn	11	const,const	1	where used
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	FIRST	t1	ref	btn	btn	11	const,const	1	where used
 drop table t1;
 CREATE TABLE t1 (
 a int default NULL,
@@ -194,16 +194,16 @@ INSERT INTO t1 VALUES (NULL,99),(99,NULL),(1,1),(2,2),(1,3);
 SELECT * FROM t1 WHERE a=NULL;
 a	b
 explain SELECT * FROM t1 WHERE a IS NULL;
-table	type	possible_keys	key	key_len	ref	rows	Extra
-t1	ref	a	a	5	const	1	where used
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	FIRST	t1	ref	a	a	5	const	1	where used
 SELECT * FROM t1 WHERE a<=>NULL;
 a	b
 NULL	99
 SELECT * FROM t1 WHERE b=NULL;
 a	b
 explain SELECT * FROM t1 WHERE b IS NULL;
-table	type	possible_keys	key	key_len	ref	rows	Extra
-t1	ref	b	b	5	const	1	where used
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	FIRST	t1	ref	b	b	5	const	1	where used
 SELECT * FROM t1 WHERE b<=>NULL;
 a	b
 99	NULL