database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Fixed main.mysqld-help and connect.drop-open-error tests

Browse Source
This commit is contained in:
Monty
2023-06-13 20:19:19 +03:00
parent 5b37d58306
commit c4cf5e17ac
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mysql-test/main/mysqld--help.test
View File

@ -23,11 +23,13 @@ perl;
# their paths may vary: # their paths may vary:
@skipvars=qw/basedir open-files-limit general-log-file log plugin-dir plugin-maturity @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-queries pid-file slow-query-log-file log-basename
log-slow-query-file
datadir slave-load-tmpdir tmpdir socket thread-pool-size datadir slave-load-tmpdir tmpdir socket thread-pool-size
large-files-support lower-case-file-system system-time-zone large-files-support lower-case-file-system system-time-zone
collation-server character-set-server log-tc-size table-cache collation-server character-set-server log-tc-size table-cache
table-open-cache table-open-cache-instances max-connections table-open-cache table-open-cache-instances max-connections
tls-version version.* password-reuse-check tls-version version.* password-reuse-check
provider-bzip2 provider-lzma provider-lzo
password-reuse-check-interval/; password-reuse-check-interval/;
# Plugins which may or may not be there: # Plugins which may or may not be there:
@ -39,7 +41,8 @@ perl;
query-response-time metadata-lock-info locales unix-socket query-response-time metadata-lock-info locales unix-socket
wsrep file-key-management cracklib-password-check user-variables wsrep file-key-management cracklib-password-check user-variables
provider-bzip2 provider-lzma provider-lzo 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 # And substitute the content some environment variables with their
# names: # names:

2
storage/connect/mysql-test/connect/r/drop-open-error.result
View File

@ -3,7 +3,7 @@ create table tcon engine=connect table_type=mysql CONNECTION='mysql://root@local
ERROR HY000: Too long value for 'SRCDEF' ERROR HY000: Too long value for 'SRCDEF'
drop table mdev9949; drop table mdev9949;
Warnings: 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; drop table t1;
select @@secure_file_priv 'must be NULL'; select @@secure_file_priv 'must be NULL';
must be NULL must be NULL

1
storage/connect/mysql-test/connect/t/drop-open-error.test
View File

@ -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 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; 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 mdev9949;
drop table t1; drop table t1;