From 3b3200e24aa5ebf038a7db830c04a111d14d5aee Mon Sep 17 00:00:00 2001 From: Yuchen Pei Date: Fri, 15 Sep 2023 13:12:55 +1000 Subject: [PATCH] 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. --- storage/spider/mysql-test/spider/bugfix/r/mdev_31117.result | 1 + storage/spider/mysql-test/spider/bugfix/r/mdev_31338.result | 1 + storage/spider/mysql-test/spider/bugfix/t/mdev_31117.test | 1 + storage/spider/mysql-test/spider/bugfix/t/mdev_31338.test | 1 + 4 files changed, 4 insertions(+) diff --git a/storage/spider/mysql-test/spider/bugfix/r/mdev_31117.result b/storage/spider/mysql-test/spider/bugfix/r/mdev_31117.result index 2b09addac0e..2929f6564b8 100644 --- 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 index dd951933fff..62b06336ff6 100644 --- 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 index e03bc874254..7baeba3f53f 100644 --- 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 index 95ca7c1253c..e628c3b921d 100644 --- 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