summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Babaev <igor@askmonty.org>2018-07-05 15:10:47 -0700
committerIgor Babaev <igor@askmonty.org>2018-07-05 15:10:47 -0700
commite9b78a1055c2b21fac1fc43dc8d660778d493fa6 (patch)
tree38a4cdb9e33a703cc61baa44f4cbb36c3c24c88a
parent1b335a74b4ea1944d6ef91113b1a510c0f11c557 (diff)
downloadmariadb-git-e9b78a1055c2b21fac1fc43dc8d660778d493fa6.tar.gz
Removed the test case for MDEV-15151 for the following reasons:
1. The changed variant did not fail without the patch for MDEV-16629 while the original test case did fail. 2. In any case the test case should go to cte_recursive_not_embedded.test that was not created yet.
-rw-r--r--mysql-test/r/cte_recursive.result21
-rw-r--r--mysql-test/t/cte_recursive.test31
2 files changed, 0 insertions, 52 deletions
diff --git a/mysql-test/r/cte_recursive.result b/mysql-test/r/cte_recursive.result
index d715fa20a6f..c892c76b33e 100644
--- a/mysql-test/r/cte_recursive.result
+++ b/mysql-test/r/cte_recursive.result
@@ -3300,24 +3300,3 @@ SELECT func();
func()
1
DROP FUNCTION func;
-#
-# MDEV-15151: function with recursive CTE using no base tables
-# (duplicate of MDEV-16661)
-#
-connection default;
-CREATE TABLE t1 (id int KEY);
-INSERT INTO t1 VALUES (0), (1),(2);
-CREATE OR REPLACE FUNCTION func() RETURNS int
-RETURN
-(
-WITH recursive cte AS
-(SELECT 1 a UNION SELECT cte.* FROM cte natural join t1)
-SELECT * FROM cte limit 1
-);
-connect con1,localhost,root,,;
-SELECT func();
-connection default;
-KILL QUERY 5;
-DROP FUNCTION func;
-DROP TABLE t1;
-disconnect con1;
diff --git a/mysql-test/t/cte_recursive.test b/mysql-test/t/cte_recursive.test
index 227ccd0cdb3..4eee9ef2214 100644
--- a/mysql-test/t/cte_recursive.test
+++ b/mysql-test/t/cte_recursive.test
@@ -1,4 +1,3 @@
---source include/not_embedded.inc
create table t1 (a int, b varchar(32));
insert into t1 values
(4,'aaaa' ), (7,'bb'), (1,'ccc'), (4,'dd');
@@ -2324,33 +2323,3 @@ RETURN
SELECT func();
DROP FUNCTION func;
-
---echo #
---echo # MDEV-15151: function with recursive CTE using no base tables
---echo # (duplicate of MDEV-16661)
---echo #
-
---connection default
-
-CREATE TABLE t1 (id int KEY);
-INSERT INTO t1 VALUES (0), (1),(2);
-
-CREATE OR REPLACE FUNCTION func() RETURNS int
-RETURN
-(
- WITH recursive cte AS
- (SELECT 1 a UNION SELECT cte.* FROM cte natural join t1)
- SELECT * FROM cte limit 1
-);
-
---connect (con1,localhost,root,,)
---let $conid= `SELECT CONNECTION_ID()`
---send SELECT func()
-
---connection default
---eval KILL QUERY $conid
---source include/restart_mysqld.inc
-
-DROP FUNCTION func;
-DROP TABLE t1;
---disconnect con1