At file:///home/bell/maria/bzr/work-maria-5.3-lb615752/

------------------------------------------------------------
revno: 2814
revision-id: [email protected]
parent: [email protected]
committer: [email protected]
branch nick: work-maria-5.3-lb615752
timestamp: Wed 2010-09-01 17:42:41 +0300
message:
  pbxt test suite fix (expression test added to EXPLAIN EXTENDED).
=== modified file 'mysql-test/suite/pbxt/r/subselect.result'
--- a/mysql-test/suite/pbxt/r/subselect.result  2010-06-26 10:05:41 +0000
+++ b/mysql-test/suite/pbxt/r/subselect.result  2010-09-01 14:42:41 +0000
@@ -50,7 +50,7 @@
 Warnings:
 Note   1276    Field or reference 'b.a' of SELECT #3 was resolved in SELECT #1
 Note   1276    Field or reference 'b.a' of SELECT #3 was resolved in SELECT #1
-Note   1003    select 1 AS `1` from (select 1 AS `a`) `b` having ((select '1') 
= 1)
+Note   1003    select 1 AS `1` from (select 1 AS `a`) `b` having 
(<expr_cache>((select '1')) = 1)
 SELECT 1 FROM (SELECT 1 as a) as b HAVING (SELECT a)=1;
 1
 1
@@ -314,7 +314,7 @@
 Warnings:
 Note   1276    Field or reference 'test.t2.a' of SELECT #2 was resolved in 
SELECT #1
 Note   1276    Field or reference 'test.t2.a' of SELECT #3 was resolved in 
SELECT #1
-Note   1003    select (select `test`.`t1`.`a` from `test`.`t1` where 
(`test`.`t1`.`a` = `test`.`t2`.`a`) union select `test`.`t5`.`a` from 
`test`.`t5` where (`test`.`t5`.`a` = `test`.`t2`.`a`)) AS `(select a from t1 
where t1.a=t2.a union select a from t5 where t5.a=t2.a)`,`test`.`t2`.`a` AS `a` 
from `test`.`t2`
+Note   1003    select <expr_cache>((select `test`.`t1`.`a` from `test`.`t1` 
where (`test`.`t1`.`a` = `test`.`t2`.`a`) union select `test`.`t5`.`a` from 
`test`.`t5` where (`test`.`t5`.`a` = `test`.`t2`.`a`))) AS `(select a from t1 
where t1.a=t2.a union select a from t5 where t5.a=t2.a)`,`test`.`t2`.`a` AS `a` 
from `test`.`t2`
 select (select a from t1 where t1.a=t2.a union all select a from t5 where 
t5.a=t2.a), a from t2;
 ERROR 21000: Subquery returns more than 1 row
 create table t6 (patient_uq int, clinic_uq int, index i1 (clinic_uq));
@@ -332,7 +332,7 @@
 2      DEPENDENT SUBQUERY      t7      eq_ref  PRIMARY PRIMARY 4       
test.t6.clinic_uq       1       100.00  Using index
 Warnings:
 Note   1276    Field or reference 'test.t6.clinic_uq' of SELECT #2 was 
resolved in SELECT #1
-Note   1003    select `test`.`t6`.`patient_uq` AS 
`patient_uq`,`test`.`t6`.`clinic_uq` AS `clinic_uq` from `test`.`t6` where 
exists(select 1 from `test`.`t7` where (`test`.`t7`.`uq` = 
`test`.`t6`.`clinic_uq`))
+Note   1003    select `test`.`t6`.`patient_uq` AS 
`patient_uq`,`test`.`t6`.`clinic_uq` AS `clinic_uq` from `test`.`t6` where 
<expr_cache>(exists(select 1 from `test`.`t7` where (`test`.`t7`.`uq` = 
`test`.`t6`.`clinic_uq`)))
 select * from t1 where a= (select a from t2,t4 where t2.b=t4.b);
 ERROR 23000: Column 'a' in field list is ambiguous
 drop table t1,t2,t3;
@@ -743,7 +743,7 @@
 3      DEPENDENT UNION NULL    NULL    NULL    NULL    NULL    NULL    NULL    
NULL    No tables used
 NULL   UNION RESULT    <union2,3>      ALL     NULL    NULL    NULL    NULL    
NULL    NULL    
 Warnings:
-Note   1003    select `test`.`t2`.`id` AS `id` from `test`.`t2` where 
<in_optimizer>(`test`.`t2`.`id`,<exists>(select 1 having 
(<cache>(`test`.`t2`.`id`) = <ref_null_helper>(1)) union select 3 having 
(<cache>(`test`.`t2`.`id`) = <ref_null_helper>(3))))
+Note   1003    select `test`.`t2`.`id` AS `id` from `test`.`t2` where 
<expr_cache>(<in_optimizer>(`test`.`t2`.`id`,<exists>(select 1 having 
(<cache>(`test`.`t2`.`id`) = <ref_null_helper>(1)) union select 3 having 
(<cache>(`test`.`t2`.`id`) = <ref_null_helper>(3)))))
 SELECT * FROM t2 WHERE id IN (SELECT 5 UNION SELECT 3);
 id
 SELECT * FROM t2 WHERE id IN (SELECT 5 UNION SELECT 2);
@@ -893,7 +893,7 @@
 1      PRIMARY t1      index   NULL    PRIMARY 4       NULL    4       100.00  
Using index
 2      DEPENDENT SUBQUERY      t2      index_subquery  a       a       5       
func    2       100.00  Using index
 Warnings:
-Note   1003    select `test`.`t1`.`a` AS 
`a`,<in_optimizer>(`test`.`t1`.`a`,<exists>(<index_lookup>(<cache>(`test`.`t1`.`a`)
 in t2 on a checking NULL having <is_not_null_test>(`test`.`t2`.`a`)))) AS 
`t1.a in (select t2.a from t2)` from `test`.`t1`
+Note   1003    select `test`.`t1`.`a` AS 
`a`,<expr_cache>(<in_optimizer>(`test`.`t1`.`a`,<exists>(<index_lookup>(<cache>(`test`.`t1`.`a`)
 in t2 on a checking NULL having <is_not_null_test>(`test`.`t2`.`a`))))) AS 
`t1.a in (select t2.a from t2)` from `test`.`t1`
 CREATE TABLE t3 (a int(11) default '0');
 INSERT INTO t3 VALUES (1),(2),(3);
 SELECT t1.a, t1.a in (select t2.a from t2,t3 where t3.a=t2.a) FROM t1;
@@ -908,7 +908,7 @@
 2      DEPENDENT SUBQUERY      t2      ref_or_null     a       a       5       
func    2       100.00  Using index
 2      DEPENDENT SUBQUERY      t3      ALL     NULL    NULL    NULL    NULL    
3       100.00  Using where; Using join buffer
 Warnings:
-Note   1003    select `test`.`t1`.`a` AS 
`a`,<in_optimizer>(`test`.`t1`.`a`,<exists>(select 1 from `test`.`t2` join 
`test`.`t3` where ((`test`.`t3`.`a` = `test`.`t2`.`a`) and 
((<cache>(`test`.`t1`.`a`) = `test`.`t2`.`a`) or isnull(`test`.`t2`.`a`))) 
having <is_not_null_test>(`test`.`t2`.`a`))) AS `t1.a in (select t2.a from 
t2,t3 where t3.a=t2.a)` from `test`.`t1`
+Note   1003    select `test`.`t1`.`a` AS 
`a`,<expr_cache>(<in_optimizer>(`test`.`t1`.`a`,<exists>(select 1 from 
`test`.`t2` join `test`.`t3` where ((`test`.`t3`.`a` = `test`.`t2`.`a`) and 
((<cache>(`test`.`t1`.`a`) = `test`.`t2`.`a`) or isnull(`test`.`t2`.`a`))) 
having <is_not_null_test>(`test`.`t2`.`a`)))) AS `t1.a in (select t2.a from 
t2,t3 where t3.a=t2.a)` from `test`.`t1`
 drop table t1,t2,t3;
 create table t1 (a float);
 select 10.5 IN (SELECT * from t1 LIMIT 1);
@@ -1465,25 +1465,25 @@
 1      PRIMARY t1      index   NULL    s1      6       NULL    3       100.00  
Using index
 2      DEPENDENT SUBQUERY      t2      index_subquery  s1      s1      6       
func    2       100.00  Using index; Full scan on NULL key
 Warnings:
-Note   1003    select `test`.`t1`.`s1` AS 
`s1`,(not(<in_optimizer>(`test`.`t1`.`s1`,<exists>(<index_lookup>(<cache>(`test`.`t1`.`s1`)
 in t2 on s1 checking NULL having 
trigcond(<is_not_null_test>(`test`.`t2`.`s1`))))))) AS `s1 NOT IN (SELECT s1 
FROM t2)` from `test`.`t1`
+Note   1003    select `test`.`t1`.`s1` AS 
`s1`,(not(<expr_cache>(<in_optimizer>(`test`.`t1`.`s1`,<exists>(<index_lookup>(<cache>(`test`.`t1`.`s1`)
 in t2 on s1 checking NULL having 
trigcond(<is_not_null_test>(`test`.`t2`.`s1`)))))))) AS `s1 NOT IN (SELECT s1 
FROM t2)` from `test`.`t1`
 explain extended select s1, s1 = ANY (SELECT s1 FROM t2) from t1;
 id     select_type     table   type    possible_keys   key     key_len ref     
rows    filtered        Extra
 1      PRIMARY t1      index   NULL    s1      6       NULL    3       100.00  
Using index
 2      DEPENDENT SUBQUERY      t2      index_subquery  s1      s1      6       
func    2       100.00  Using index; Full scan on NULL key
 Warnings:
-Note   1003    select `test`.`t1`.`s1` AS 
`s1`,<in_optimizer>(`test`.`t1`.`s1`,<exists>(<index_lookup>(<cache>(`test`.`t1`.`s1`)
 in t2 on s1 checking NULL having 
trigcond(<is_not_null_test>(`test`.`t2`.`s1`))))) AS `s1 = ANY (SELECT s1 FROM 
t2)` from `test`.`t1`
+Note   1003    select `test`.`t1`.`s1` AS 
`s1`,<expr_cache>(<in_optimizer>(`test`.`t1`.`s1`,<exists>(<index_lookup>(<cache>(`test`.`t1`.`s1`)
 in t2 on s1 checking NULL having 
trigcond(<is_not_null_test>(`test`.`t2`.`s1`)))))) AS `s1 = ANY (SELECT s1 FROM 
t2)` from `test`.`t1`
 explain extended select s1, s1 <> ALL (SELECT s1 FROM t2) from t1;
 id     select_type     table   type    possible_keys   key     key_len ref     
rows    filtered        Extra
 1      PRIMARY t1      index   NULL    s1      6       NULL    3       100.00  
Using index
 2      DEPENDENT SUBQUERY      t2      index_subquery  s1      s1      6       
func    2       100.00  Using index; Full scan on NULL key
 Warnings:
-Note   1003    select `test`.`t1`.`s1` AS 
`s1`,(not(<in_optimizer>(`test`.`t1`.`s1`,<exists>(<index_lookup>(<cache>(`test`.`t1`.`s1`)
 in t2 on s1 checking NULL having 
trigcond(<is_not_null_test>(`test`.`t2`.`s1`))))))) AS `s1 <> ALL (SELECT s1 
FROM t2)` from `test`.`t1`
+Note   1003    select `test`.`t1`.`s1` AS 
`s1`,(not(<expr_cache>(<in_optimizer>(`test`.`t1`.`s1`,<exists>(<index_lookup>(<cache>(`test`.`t1`.`s1`)
 in t2 on s1 checking NULL having 
trigcond(<is_not_null_test>(`test`.`t2`.`s1`)))))))) AS `s1 <> ALL (SELECT s1 
FROM t2)` from `test`.`t1`
 explain extended select s1, s1 NOT IN (SELECT s1 FROM t2 WHERE s1 < 'a2') from 
t1;
 id     select_type     table   type    possible_keys   key     key_len ref     
rows    filtered        Extra
 1      PRIMARY t1      index   NULL    s1      6       NULL    3       100.00  
Using index
 2      DEPENDENT SUBQUERY      t2      index_subquery  s1      s1      6       
func    2       100.00  Using index; Using where; Full scan on NULL key
 Warnings:
-Note   1003    select `test`.`t1`.`s1` AS 
`s1`,(not(<in_optimizer>(`test`.`t1`.`s1`,<exists>(<index_lookup>(<cache>(`test`.`t1`.`s1`)
 in t2 on s1 checking NULL where (`test`.`t2`.`s1` < 'a2') having 
trigcond(<is_not_null_test>(`test`.`t2`.`s1`))))))) AS `s1 NOT IN (SELECT s1 
FROM t2 WHERE s1 < 'a2')` from `test`.`t1`
+Note   1003    select `test`.`t1`.`s1` AS 
`s1`,(not(<expr_cache>(<in_optimizer>(`test`.`t1`.`s1`,<exists>(<index_lookup>(<cache>(`test`.`t1`.`s1`)
 in t2 on s1 checking NULL where (`test`.`t2`.`s1` < 'a2') having 
trigcond(<is_not_null_test>(`test`.`t2`.`s1`)))))))) AS `s1 NOT IN (SELECT s1 
FROM t2 WHERE s1 < 'a2')` from `test`.`t1`
 drop table t1,t2;
 create table t2 (a int, b int);
 create table t3 (a int);
@@ -1738,14 +1738,14 @@
 1      PRIMARY t1      ALL     NULL    NULL    NULL    NULL    12      100.00  
Using where
 2      DEPENDENT SUBQUERY      t1      unique_subquery PRIMARY PRIMARY 4       
func    1       100.00  Using index; Using where
 Warnings:
-Note   1003    select `test`.`t1`.`id` AS `id`,`test`.`t1`.`text` AS `text` 
from `test`.`t1` where 
(not(<in_optimizer>(`test`.`t1`.`id`,<exists>(<primary_index_lookup>(<cache>(`test`.`t1`.`id`)
 in t1 on PRIMARY where ((`test`.`t1`.`id` < 8) and (<cache>(`test`.`t1`.`id`) 
= `test`.`t1`.`id`)))))))
+Note   1003    select `test`.`t1`.`id` AS `id`,`test`.`t1`.`text` AS `text` 
from `test`.`t1` where 
(not(<expr_cache>(<in_optimizer>(`test`.`t1`.`id`,<exists>(<primary_index_lookup>(<cache>(`test`.`t1`.`id`)
 in t1 on PRIMARY where ((`test`.`t1`.`id` < 8) and (<cache>(`test`.`t1`.`id`) 
= `test`.`t1`.`id`))))))))
 explain extended select * from t1 as tt where not exists (select id from t1 
where id < 8 and (id = tt.id or id is null) having id is not null);
 id     select_type     table   type    possible_keys   key     key_len ref     
rows    filtered        Extra
 1      PRIMARY tt      ALL     NULL    NULL    NULL    NULL    12      100.00  
Using where
 2      DEPENDENT SUBQUERY      t1      eq_ref  PRIMARY PRIMARY 4       
test.tt.id      1       100.00  Using where; Using index
 Warnings:
 Note   1276    Field or reference 'test.tt.id' of SELECT #2 was resolved in 
SELECT #1
-Note   1003    select `test`.`tt`.`id` AS `id`,`test`.`tt`.`text` AS `text` 
from `test`.`t1` `tt` where (not(exists(select `test`.`t1`.`id` from 
`test`.`t1` where ((`test`.`t1`.`id` < 8) and (`test`.`t1`.`id` = 
`test`.`tt`.`id`)) having (`test`.`t1`.`id` is not null))))
+Note   1003    select `test`.`tt`.`id` AS `id`,`test`.`tt`.`text` AS `text` 
from `test`.`t1` `tt` where (not(<expr_cache>(exists(select `test`.`t1`.`id` 
from `test`.`t1` where ((`test`.`t1`.`id` < 8) and (`test`.`t1`.`id` = 
`test`.`tt`.`id`)) having (`test`.`t1`.`id` is not null)))))
 insert into t1 (id, text) values (1000, 'text1000'), (1001, 'text1001');
 create table t2 (id int not null, text varchar(20) not null default '', 
primary key (id));
 insert into t2 (id, text) values (1, 'text1'), (2, 'text2'), (3, 'text3'), (4, 
'text4'), (5, 'text5'), (6, 'text6'), (7, 'text7'), (8, 'text8'), (9, 'text9'), 
(10, 'text10'), (11, 'text1'), (12, 'text2'), (13, 'text3'), (14, 'text4'), 
(15, 'text5'), (16, 'text6'), (17, 'text7'), (18, 'text8'), (19, 'text9'), (20, 
'text10'),(21, 'text1'), (22, 'text2'), (23, 'text3'), (24, 'text4'), (25, 
'text5'), (26, 'text6'), (27, 'text7'), (28, 'text8'), (29, 'text9'), (30, 
'text10'), (31, 'text1'), (32, 'text2'), (33, 'text3'), (34, 'text4'), (35, 
'text5'), (36, 'text6'), (37, 'text7'), (38, 'text8'), (39, 'text9'), (40, 
'text10'), (41, 'text1'), (42, 'text2'), (43, 'text3'), (44, 'text4'), (45, 
'text5'), (46, 'text6'), (47, 'text7'), (48, 'text8'), (49, 'text9'), (50, 
'text10');
@@ -2282,7 +2282,7 @@
 2      DEPENDENT SUBQUERY      t1      ALL     NULL    NULL    NULL    NULL    
2       100.00  Using where
 Warnings:
 Note   1276    Field or reference 'test.up.a' of SELECT #2 was resolved in 
SELECT #1
-Note   1003    select `test`.`up`.`a` AS `a`,`test`.`up`.`b` AS `b` from 
`test`.`t1` `up` where exists(select 1 from `test`.`t1` where (`test`.`t1`.`a` 
= `test`.`up`.`a`))
+Note   1003    select `test`.`up`.`a` AS `a`,`test`.`up`.`b` AS `b` from 
`test`.`t1` `up` where <expr_cache>(exists(select 1 from `test`.`t1` where 
(`test`.`t1`.`a` = `test`.`up`.`a`)))
 drop table t1;
 CREATE TABLE t1 (t1_a int);
 INSERT INTO t1 VALUES (1);
@@ -2825,7 +2825,7 @@
 1      PRIMARY t1      ALL     NULL    NULL    NULL    NULL    8       100.00  
 2      DEPENDENT SUBQUERY      t2      ALL     NULL    NULL    NULL    NULL    
9       100.00  Using where
 Warnings:
-Note   1003    select `test`.`t1`.`one` AS `one`,`test`.`t1`.`two` AS 
`two`,<in_optimizer>((`test`.`t1`.`one`,`test`.`t1`.`two`),<exists>(select 
`test`.`t2`.`one`,`test`.`t2`.`two` from `test`.`t2` where ((`test`.`t2`.`flag` 
= '0') and trigcond(((<cache>(`test`.`t1`.`one`) = `test`.`t2`.`one`) or 
isnull(`test`.`t2`.`one`))) and trigcond(((<cache>(`test`.`t1`.`two`) = 
`test`.`t2`.`two`) or isnull(`test`.`t2`.`two`)))) having 
(trigcond(<is_not_null_test>(`test`.`t2`.`one`)) and 
trigcond(<is_not_null_test>(`test`.`t2`.`two`))))) AS `test` from `test`.`t1`
+Note   1003    select `test`.`t1`.`one` AS `one`,`test`.`t1`.`two` AS 
`two`,<expr_cache>(<in_optimizer>((`test`.`t1`.`one`,`test`.`t1`.`two`),<exists>(select
 `test`.`t2`.`one`,`test`.`t2`.`two` from `test`.`t2` where 
((`test`.`t2`.`flag` = '0') and trigcond(((<cache>(`test`.`t1`.`one`) = 
`test`.`t2`.`one`) or isnull(`test`.`t2`.`one`))) and 
trigcond(((<cache>(`test`.`t1`.`two`) = `test`.`t2`.`two`) or 
isnull(`test`.`t2`.`two`)))) having 
(trigcond(<is_not_null_test>(`test`.`t2`.`one`)) and 
trigcond(<is_not_null_test>(`test`.`t2`.`two`)))))) AS `test` from `test`.`t1`
 explain extended SELECT one,two from t1 where ROW(one,two) IN (SELECT one,two 
FROM t2 WHERE flag = 'N');
 id     select_type     table   type    possible_keys   key     key_len ref     
rows    filtered        Extra
 1      PRIMARY t1      ALL     NULL    NULL    NULL    NULL    8       100.00  
@@ -2837,7 +2837,7 @@
 1      PRIMARY t1      ALL     NULL    NULL    NULL    NULL    8       100.00  
 2      DEPENDENT SUBQUERY      t2      ALL     NULL    NULL    NULL    NULL    
9       100.00  Using where; Using temporary; Using filesort
 Warnings:
-Note   1003    select `test`.`t1`.`one` AS `one`,`test`.`t1`.`two` AS 
`two`,<in_optimizer>((`test`.`t1`.`one`,`test`.`t1`.`two`),<exists>(select 
`test`.`t2`.`one`,`test`.`t2`.`two` from `test`.`t2` where (`test`.`t2`.`flag` 
= '0') group by `test`.`t2`.`one`,`test`.`t2`.`two` having 
(trigcond(((<cache>(`test`.`t1`.`one`) = `test`.`t2`.`one`) or 
isnull(`test`.`t2`.`one`))) and trigcond(((<cache>(`test`.`t1`.`two`) = 
`test`.`t2`.`two`) or isnull(`test`.`t2`.`two`))) and 
trigcond(<is_not_null_test>(`test`.`t2`.`one`)) and 
trigcond(<is_not_null_test>(`test`.`t2`.`two`))))) AS `test` from `test`.`t1`
+Note   1003    select `test`.`t1`.`one` AS `one`,`test`.`t1`.`two` AS 
`two`,<expr_cache>(<in_optimizer>((`test`.`t1`.`one`,`test`.`t1`.`two`),<exists>(select
 `test`.`t2`.`one`,`test`.`t2`.`two` from `test`.`t2` where (`test`.`t2`.`flag` 
= '0') group by `test`.`t2`.`one`,`test`.`t2`.`two` having 
(trigcond(((<cache>(`test`.`t1`.`one`) = `test`.`t2`.`one`) or 
isnull(`test`.`t2`.`one`))) and trigcond(((<cache>(`test`.`t1`.`two`) = 
`test`.`t2`.`two`) or isnull(`test`.`t2`.`two`))) and 
trigcond(<is_not_null_test>(`test`.`t2`.`one`)) and 
trigcond(<is_not_null_test>(`test`.`t2`.`two`)))))) AS `test` from `test`.`t1`
 DROP TABLE t1,t2;
 set @@optimizer_swit...@save_optimizer_switch;
 CREATE TABLE t1 (a char(5), b char(5));
@@ -4284,7 +4284,7 @@
 2      DEPENDENT SUBQUERY      t2      ALL     NULL    NULL    NULL    NULL    
2       100.00  Using where
 Warnings:
 Note   1276    Field or reference 'test.t1.a' of SELECT #2 was resolved in 
SELECT #1
-Note   1003    select 2 AS `2` from `test`.`t1` where exists(select 1 from 
`test`.`t2` where (`test`.`t1`.`a` = `test`.`t2`.`a`))
+Note   1003    select 2 AS `2` from `test`.`t1` where 
<expr_cache>(exists(select 1 from `test`.`t2` where (`test`.`t1`.`a` = 
`test`.`t2`.`a`)))
 EXPLAIN EXTENDED
 SELECT 2 FROM t1 WHERE EXISTS ((SELECT 1 FROM t2 WHERE t1.a=t2.a) UNION 
 (SELECT 1 FROM t2 WHERE t1.a = t2.a));

_______________________________________________
Mailing list: https://launchpad.net/~maria-developers
Post to     : [email protected]
Unsubscribe : https://launchpad.net/~maria-developers
More help   : https://help.launchpad.net/ListHelp

Reply via email to