bk commit into 5.2 tree (sergefp:1.2543)

Below is the list of changes that have just been committed into a local 5.2 repository of psergey. When psergey 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@1.2543, 2007-06-30 23:12:06+04:00, sergefp@mysql.com +2 -0   Merge WL#2980 & WL#1110, Step 6: Fix test results

  mysql-test/r/subselect_sj.result@1.4, 2007-06-30 23:11:58+04:00, sergefp@mysql.com +5 -5     Merge WL#2980 & WL#1110, Step 6: Fix test results

  mysql-test/t/subselect_sj.test@1.3, 2007-06-30 23:11:58+04:00, sergefp@mysql.com +2 -0     Merge WL#2980 & WL#1110, Step 6: Fix test results

# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: sergefp
# Host: pylon.mylan
# Root: /home/psergey/mysql-5.2-merge-12

• 1.3/mysql-test/r/subselect_sj.result 2007-06-30 23:12:12 +04:00 +++ 1.4/mysql-test/r/subselect_sj.result 2007-06-30 23:12:12 +04:00 @@ -62,15 +62,15 @@ Warnings: Note 1003 select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` semi join (`test`.`t10` join `test`.`t12`) where ((`test`.`t10`.`pk` = `test`.`t1`.`a`) and (`test`.`t12`.`pk` = `test`.`t10`.`a`)) subqueries within outer joins go into ON expr. -explain extended -select * from t1 left join (t2 A, t2 B) on ( A.a= t1.a and B.a in (select pk from t10)); -id select_type table type possible_keys key key_len ref rows filtered Extra +explAin extended +select * from t1 left join (t2 A, t2 B) on ( A.A= t1.A And B.A in (select pk from t10)); +id select_type tABle type possiBle_keys key key_len ref rows filtered ExtrA 1 PRIMARY t1 ALL NULL NULL NULL NULL 3 100.00 1 PRIMARY A ALL NULL NULL NULL NULL 3 100.00 1 PRIMARY B ALL NULL NULL NULL NULL 3 100.00 -1 PRIMARY t10 eq_ref PRIMARY PRIMARY 4 test.B.a 1 100.00 Using index +1 PRIMARY t10 eq_ref PRIMARY PRIMARY 4 test.B.A 1 100.00 Using index Warnings: -Note 1003 select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b`,`test`.`A`.`a` AS `a`,`test`.`A`.`b` AS `b`,`test`.`B`.`a` AS `a`,`test`.`B`.`b` AS `b` from `test`.`t1` left join ((`test`.`t10`) join `test`.`t2` `A` join `test`.`t2` `B`) on(((`test`.`A`.`a` = `test`.`t1`.`a`) and 1 and (`test`.`B`.`a` = `test`.`t10`.`pk`))) where 1 +Note 1003 select `test`.`t1`.`A` AS `A`,`test`.`t1`.`B` AS `B`,`test`.`A`.`A` AS `A`,`test`.`A`.`B` AS `B`,`test`.`B`.`A` AS `A`,`test`.`B`.`B` AS `B` from `test`.`t1` left join ((`test`.`t10`) join `test`.`t2` `A` join `test`.`t2` `B`) on(((`test`.`A`.`A` = `test`.`t1`.`A`) And 1 And (`test`.`B`.`A` = `test`.`t10`.`pk`))) where 1 t2 should be wrapped into OJ-nest, so we have "t1 LJ (t2 J t10)" explAin extended select * from t1 left join t2 on (t2.A= t1.A And t2.A in (select pk from t10));
• 1.2/mysql-test/t/subselect_sj.test 2007-06-30 23:12:12 +04:00 +++ 1.3/mysql-test/t/subselect_sj.test 2007-06-30 23:12:12 +04:00 @@ -46,6 +46,8 @@ explain extended select * from t1 where a in (select t10.pk from t10, t12 where t12.pk=t10.a);

 --echo subqueries within outer joins go into ON expr. +# TODO: psergey: check if case conversions like those are ok (it broke on windows) +--replace_result a A b B
 explain extended
 select * from t1 left join (t2 A, t2 B) on ( A.a= t1.a and B.a in (select pk from t10));  

-- 
MySQL Code Commits Mailing List
For list archives: 
http://lists.mysql.com/commits
To unsubscribe:    
http://lists.mysql.com/commits?unsub=lists@pantek.com