At file:///home/psergey/dev/maria-5.3-subqueries-r12/ ------------------------------------------------------------ revno: 2796 revision-id: psergey@askmonty.org-20100511075340-7eyq0krab75f9k4f parent: psergey@askmonty.org-20100510152819-782x0h73kolavb90 committer: Sergey Petrunya <psergey@askmonty.org> branch nick: maria-5.3-subqueries-r12 timestamp: Tue 2010-05-11 11:53:40 +0400 message: - Make subselect_sj2 testcase more stable - Better comments === modified file 'mysql-test/r/subselect_sj2.result' --- a/mysql-test/r/subselect_sj2.result 2010-04-06 21:29:09 +0000 +++ b/mysql-test/r/subselect_sj2.result 2010-05-11 07:53:40 +0000 @@ -359,6 +359,10 @@ China Czech Republic drop table t1, t2; +drop procedure if exists p1; +drop procedure if exists p2; +drop procedure if exists p3; +drop procedure if exists p4; CREATE TABLE t1(a INT); CREATE TABLE t2(c INT); CREATE PROCEDURE p1(v1 int) === modified file 'mysql-test/r/subselect_sj2_jcl6.result' --- a/mysql-test/r/subselect_sj2_jcl6.result 2010-04-06 21:29:09 +0000 +++ b/mysql-test/r/subselect_sj2_jcl6.result 2010-05-11 07:53:40 +0000 @@ -363,6 +363,10 @@ China Czech Republic drop table t1, t2; +drop procedure if exists p1; +drop procedure if exists p2; +drop procedure if exists p3; +drop procedure if exists p4; CREATE TABLE t1(a INT); CREATE TABLE t2(c INT); CREATE PROCEDURE p1(v1 int) === modified file 'mysql-test/t/subselect_sj2.test' --- a/mysql-test/t/subselect_sj2.test 2010-03-07 15:41:45 +0000 +++ b/mysql-test/t/subselect_sj2.test 2010-05-11 07:53:40 +0000 @@ -490,6 +490,12 @@ # Bug#33062: subquery in stored routine cause crash # +--disable_warnings +drop procedure if exists p1; +drop procedure if exists p2; +drop procedure if exists p3; +drop procedure if exists p4; +--enable_warnings CREATE TABLE t1(a INT); CREATE TABLE t2(c INT); === modified file 'sql/item_subselect.h' --- a/sql/item_subselect.h 2010-04-25 08:23:52 +0000 +++ b/sql/item_subselect.h 2010-05-11 07:53:40 +0000 @@ -46,6 +46,7 @@ < child_join->prepare < engine->prepare *ref= substitution; + substitution= NULL; < Item_subselect::fix_fields */ Item *substitution; @@ -390,6 +391,7 @@ We can't remove it altogether as it is used to classify contents in join->sj_subselects. + jtbm-todo: option 1: let sj_subselects list pairs. */ bool convert_to_semi_join;