From c4cf5e17ac33a524c6e2029c0614a971b0e1bbdf Mon Sep 17 00:00:00 2001 From: Monty Date: Tue, 13 Jun 2023 20:19:19 +0300 Subject: [PATCH] Fixed main.mysqld-help and connect.drop-open-error tests --- mysql-test/main/mysqld--help.test | 5 ++++- storage/connect/mysql-test/connect/r/drop-open-error.result | 2 +- storage/connect/mysql-test/connect/t/drop-open-error.test | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/mysql-test/main/mysqld--help.test b/mysql-test/main/mysqld--help.test index 42f551974d9..ad2307f43c6 100644 --- a/mysql-test/main/mysqld--help.test +++ b/mysql-test/main/mysqld--help.test @@ -23,11 +23,13 @@ perl; # their paths may vary: @skipvars=qw/basedir open-files-limit general-log-file log plugin-dir plugin-maturity log-slow-queries pid-file slow-query-log-file log-basename + log-slow-query-file datadir slave-load-tmpdir tmpdir socket thread-pool-size large-files-support lower-case-file-system system-time-zone collation-server character-set-server log-tc-size table-cache table-open-cache table-open-cache-instances max-connections tls-version version.* password-reuse-check + provider-bzip2 provider-lzma provider-lzo password-reuse-check-interval/; # Plugins which may or may not be there: @@ -39,7 +41,8 @@ perl; query-response-time metadata-lock-info locales unix-socket wsrep file-key-management cracklib-password-check user-variables provider-bzip2 provider-lzma provider-lzo - thread-pool-groups thread-pool-queues thread-pool-stats thread-pool-waits/; + thread-pool-groups thread-pool-queues thread-pool-stats + thread-pool-waits hashicorp provider gssapi/; # And substitute the content some environment variables with their # names: diff --git a/storage/connect/mysql-test/connect/r/drop-open-error.result b/storage/connect/mysql-test/connect/r/drop-open-error.result index 34f58a845dc..a5d1e89307b 100644 --- a/storage/connect/mysql-test/connect/r/drop-open-error.result +++ b/storage/connect/mysql-test/connect/r/drop-open-error.result @@ -3,7 +3,7 @@ create table tcon engine=connect table_type=mysql CONNECTION='mysql://root@local ERROR HY000: Too long value for 'SRCDEF' drop table mdev9949; Warnings: -Warning 1017 Can't find file: './test/mdev9949.dos' (errno: 2 "No such file or directory") +Warning 1017 Can't find file: 'MYSQLD_DATADIR/test/mdev9949.dos' (errno: 2 "No such file or directory") drop table t1; select @@secure_file_priv 'must be NULL'; must be NULL diff --git a/storage/connect/mysql-test/connect/t/drop-open-error.test b/storage/connect/mysql-test/connect/t/drop-open-error.test index 0b73ac98779..69e634e82bd 100644 --- a/storage/connect/mysql-test/connect/t/drop-open-error.test +++ b/storage/connect/mysql-test/connect/t/drop-open-error.test @@ -14,6 +14,7 @@ create table tcon engine=connect table_type=mysql CONNECTION='mysql://root@local # copy the invalid frm (as created by the statement above before the MDEV-9949 fix) copy_file $MTR_SUITE_DIR/std_data/mdev9949.frm $datadir/test/mdev9949.frm; +--replace_result $datadir MYSQLD_DATADIR/ ./ MYSQLD_DATADIR/ drop table mdev9949; drop table t1;