bk commit into 5.1 tree (timour:1.2677) BUG#32694

[timour]

Below is the list of changes that have just been committed into a local
5.1 repository of tkatchaounov. When tkatchaounov 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, 2007-12-08 23:54:07+02:00, timour@stripped +2 -0
  BUG#32694 post-merge adjustment of EXPLAIN results for 5.1.

  BitKeeper/etc/ignore@stripped, 2007-12-08 23:54:05+02:00, timour@stripped +1 -0
    Added ylwrap to the ignore list

  mysql-test/r/type_datetime.result@stripped, 2007-12-08 23:54:03+02:00, timour@stripped
+12 -12
    BUG#32694 post-merge adjustment of EXPLAIN results for 5.1.

diff -Nrup a/BitKeeper/etc/ignore b/BitKeeper/etc/ignore
--- a/BitKeeper/etc/ignore	2007-11-20 12:35:39 +02:00
+++ b/BitKeeper/etc/ignore	2007-12-08 23:54:05 +02:00
@@ -3008,3 +3008,4 @@ win/vs71cache.txt
 win/vs8cache.txt
 zlib/*.ds?
 zlib/*.vcproj
+ylwrap
diff -Nrup a/mysql-test/r/type_datetime.result b/mysql-test/r/type_datetime.result
--- a/mysql-test/r/type_datetime.result	2007-12-08 23:10:15 +02:00
+++ b/mysql-test/r/type_datetime.result	2007-12-08 23:54:03 +02:00
@@ -512,9 +512,9 @@ insert into t2 (id, cur_date) values (1,
 explain extended
 select * from t1
 where id in (select id from t1 as x1 where (t1.cur_date is null));
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const
tables
-2	DEPENDENT SUBQUERY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading
const tables
+2	DEPENDENT SUBQUERY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE
 Warnings:
 Note	1276	Field or reference 'test.t1.cur_date' of SELECT #2 was resolved in SELECT #1
 Note	1003	select '1' AS `id`,'2007-04-25 18:30:22' AS `cur_date` from `test`.`t1` where
<in_optimizer>('1',<exists>(select 1 AS `Not_used` from `test`.`t1` `x1`
where 0))
@@ -524,9 +524,9 @@ id	cur_date
 explain extended
 select * from t2
 where id in (select id from t2 as x1 where (t2.cur_date is null));
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const
tables
-2	DEPENDENT SUBQUERY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading
const tables
+2	DEPENDENT SUBQUERY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE
 Warnings:
 Note	1276	Field or reference 'test.t2.cur_date' of SELECT #2 was resolved in SELECT #1
 Note	1003	select '1' AS `id`,'2007-04-25' AS `cur_date` from `test`.`t2` where
<in_optimizer>('1',<exists>(select 1 AS `Not_used` from `test`.`t2` `x1`
where 0))
@@ -538,9 +538,9 @@ insert into t2 (id, cur_date) values (2,
 explain extended
 select * from t1
 where id in (select id from t1 as x1 where (t1.cur_date is null));
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	2	Using where
-2	DEPENDENT SUBQUERY	x1	ALL	NULL	NULL	NULL	NULL	2	Using where
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	2	100.00	Using where
+2	DEPENDENT SUBQUERY	x1	ALL	NULL	NULL	NULL	NULL	2	100.00	Using where
 Warnings:
 Note	1276	Field or reference 'test.t1.cur_date' of SELECT #2 was resolved in SELECT #1
 Note	1003	select `test`.`t1`.`id` AS `id`,`test`.`t1`.`cur_date` AS `cur_date` from
`test`.`t1` where <in_optimizer>(`test`.`t1`.`id`,<exists>(select 1 AS
`Not_used` from `test`.`t1` `x1` where ((`test`.`t1`.`cur_date` = 0) and
(<cache>(`test`.`t1`.`id`) = `test`.`x1`.`id`))))
@@ -550,9 +550,9 @@ id	cur_date
 explain extended
 select * from t2
 where id in (select id from t2 as x1 where (t2.cur_date is null));
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	PRIMARY	t2	ALL	NULL	NULL	NULL	NULL	2	Using where
-2	DEPENDENT SUBQUERY	x1	ALL	NULL	NULL	NULL	NULL	2	Using where
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	PRIMARY	t2	ALL	NULL	NULL	NULL	NULL	2	100.00	Using where
+2	DEPENDENT SUBQUERY	x1	ALL	NULL	NULL	NULL	NULL	2	100.00	Using where
 Warnings:
 Note	1276	Field or reference 'test.t2.cur_date' of SELECT #2 was resolved in SELECT #1
 Note	1003	select `test`.`t2`.`id` AS `id`,`test`.`t2`.`cur_date` AS `cur_date` from
`test`.`t2` where <in_optimizer>(`test`.`t2`.`id`,<exists>(select 1 AS
`Not_used` from `test`.`t2` `x1` where ((`test`.`t2`.`cur_date` = 0) and
(<cache>(`test`.`t2`.`id`) = `test`.`x1`.`id`))))