From ac321a3440a5ff48da5f96def454327335b69742 Mon Sep 17 00:00:00 2001 From: Igor Babaev Date: Fri, 20 May 2011 12:59:52 -0700 Subject: [PATCH] Added back the SP calls from the test case for bug 48073. After the fix of LP bug 784723 the test case returns the right results. --- mysql-test/r/subselect_sj.result | 8 ++++++++ mysql-test/r/subselect_sj_jcl6.result | 8 ++++++++ mysql-test/t/subselect_sj.test | 6 ++---- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/mysql-test/r/subselect_sj.result b/mysql-test/r/subselect_sj.result index 1b5604d50fd..2df5089b064 100644 --- a/mysql-test/r/subselect_sj.result +++ b/mysql-test/r/subselect_sj.result @@ -574,6 +574,14 @@ WHERE v1field IN ( SELECT v2field as vf_inner FROM v2 ); END| INSERT INTO t1 VALUES (1),(2),(3); INSERT INTO t2 VALUES (2),(3),(4); +CALL p1; +v1field +2 +3 +CALL p1; +v1field +2 +3 DROP TABLE t1,t2; DROP VIEW v1,v2; DROP PROCEDURE p1; diff --git a/mysql-test/r/subselect_sj_jcl6.result b/mysql-test/r/subselect_sj_jcl6.result index 53aa07a6840..22335c25655 100644 --- a/mysql-test/r/subselect_sj_jcl6.result +++ b/mysql-test/r/subselect_sj_jcl6.result @@ -582,6 +582,14 @@ WHERE v1field IN ( SELECT v2field as vf_inner FROM v2 ); END| INSERT INTO t1 VALUES (1),(2),(3); INSERT INTO t2 VALUES (2),(3),(4); +CALL p1; +v1field +2 +3 +CALL p1; +v1field +2 +3 DROP TABLE t1,t2; DROP VIEW v1,v2; DROP PROCEDURE p1; diff --git a/mysql-test/t/subselect_sj.test b/mysql-test/t/subselect_sj.test index e107210050b..eeca05985b8 100644 --- a/mysql-test/t/subselect_sj.test +++ b/mysql-test/t/subselect_sj.test @@ -522,10 +522,8 @@ DELIMITER ;| INSERT INTO t1 VALUES (1),(2),(3); INSERT INTO t2 VALUES (2),(3),(4); -# These SP calls return a wrong result set due to a bug in the code of mwl106 -# Uncomment them when the bug is fixed -# CALL p1; -# CALL p1; +CALL p1; +CALL p1; DROP TABLE t1,t2; DROP VIEW v1,v2;