summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2021-11-29 10:34:33 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2021-11-29 10:34:33 +0200
commitfafe60e7e2da72488ff3741367a962b45a23b8ee (patch)
tree6faf3cfeb03d33da6a8cf5db31bc2754945103fe
parent289721de9aca8cdf3bdef1a010477e2d38eebb8d (diff)
downloadmariadb-git-fafe60e7e2da72488ff3741367a962b45a23b8ee.tar.gz
MDEV-27134: Sporadic failure of DROP DATABASE test
Let us create and drop a separate database for getting rid of the default database in the MDEV-22781 test.
-rw-r--r--mysql-test/main/cte_nonrecursive.result5
-rw-r--r--mysql-test/main/cte_nonrecursive.test5
2 files changed, 6 insertions, 4 deletions
diff --git a/mysql-test/main/cte_nonrecursive.result b/mysql-test/main/cte_nonrecursive.result
index b28c2d4e206..0d8bd151708 100644
--- a/mysql-test/main/cte_nonrecursive.result
+++ b/mysql-test/main/cte_nonrecursive.result
@@ -1693,7 +1693,9 @@ disconnect con1;
#
# MDEV-22781: create view with CTE without default database
#
-drop database test;
+create database db;
+use db;
+drop database db;
create database db1;
create table db1.t1 (a int);
insert into db1.t1 values (3),(7),(1);
@@ -1723,7 +1725,6 @@ a
drop view db1.v1;
drop table db1.t1;
drop database db1;
-create database test;
use test;
#
# MDEV-24597: CTE with union used multiple times in query
diff --git a/mysql-test/main/cte_nonrecursive.test b/mysql-test/main/cte_nonrecursive.test
index 41a0146e4d0..0a18ff3a333 100644
--- a/mysql-test/main/cte_nonrecursive.test
+++ b/mysql-test/main/cte_nonrecursive.test
@@ -1205,7 +1205,9 @@ DROP TABLE test.t;
--echo # MDEV-22781: create view with CTE without default database
--echo #
-drop database test;
+create database db;
+use db;
+drop database db;
create database db1;
create table db1.t1 (a int);
insert into db1.t1 values (3),(7),(1);
@@ -1227,7 +1229,6 @@ drop view db1.v1;
drop table db1.t1;
drop database db1;
-create database test;
use test;
--echo #