MDEV-32157 MDEV-28856 Spider: drop server in tests

This helps eliminate "server exists" failures Also, spider/bugfix.mdev_29676, when enabled after MDEV-29525 is pushed will fail because we have not --recorded the result. But the failure will only emerge when working on MDEV-31138 where we manually re-enable this test, so let's worry about that then.
MariaDB · Sep 15, 2023 · 3b3200e · 3b3200e
1 parent 96760d3
commit 3b3200e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 0 deletions.
diff --git a/storage/spider/mysql-test/spider/bugfix/r/mdev_31117.result b/storage/spider/mysql-test/spider/bugfix/r/mdev_31117.result
@@ -14,6 +14,7 @@ create table t1 (c int) ENGINE=Spider COMMENT='WRAPPER "mysql", "srv" "srv",TABL
 ERROR HY000: The connect info '"srv" "srv",TABLE "t2"' is invalid
 create table t1 (c int) ENGINE=Spider CONNECTION='WRAPPER "mysql", srv \'srv\',TABLE "t2", password "say \\"hello\\ world!\\""';
 drop table t1, t2;
+drop server srv;
 for master_1
 for child2
 for child3
diff --git a/storage/spider/mysql-test/spider/bugfix/r/mdev_31338.result b/storage/spider/mysql-test/spider/bugfix/r/mdev_31338.result
@@ -10,6 +10,7 @@ CREATE TABLE ts (c BLOB) ENGINE=Spider COMMENT='WRAPPER "mysql",srv "srv",TABLE
 SELECT TRIM(BOTH ' ' FROM c) FROM ts ORDER BY c;
 TRIM(BOTH ' ' FROM c)
 drop table t, ts;
+drop server srv;
 for master_1
 for child2
 for child3
diff --git a/storage/spider/mysql-test/spider/bugfix/t/mdev_31117.test b/storage/spider/mysql-test/spider/bugfix/t/mdev_31117.test
@@ -23,6 +23,7 @@ create table t1 (c int) ENGINE=Spider COMMENT='WRAPPER "mysql", "srv" "srv",TABL
 create table t1 (c int) ENGINE=Spider CONNECTION='WRAPPER "mysql", srv \'srv\',TABLE "t2", password "say \\"hello\\ world!\\""';
 drop table t1, t2;
 
+drop server srv;
 --disable_query_log
 --disable_result_log
 --source ../t/test_deinit.inc

diff --git a/storage/spider/mysql-test/spider/bugfix/t/mdev_31338.test b/storage/spider/mysql-test/spider/bugfix/t/mdev_31338.test
@@ -15,6 +15,7 @@ CREATE TABLE ts (c BLOB) ENGINE=Spider COMMENT='WRAPPER "mysql",srv "srv",TABLE
 SELECT TRIM(BOTH ' ' FROM c) FROM ts ORDER BY c;
 drop table t, ts;
 
+drop server srv;
 --disable_query_log
 --disable_result_log
 --source ../../t/test_deinit.inc