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

make S3 tests to run when S3 is statically linked

Browse Source 
* use the environment variable HA_S3_SO, not a literal ha_s3 in cnf files
* make ConfigFactory to support empty option values
* update no_s3.result after MDEV-11412
This commit is contained in:
Sergei Golubchik
2020-09-10 12:12:47 +02:00
parent 5ad36aa3b8
commit 897b51db43
4 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/lib/My/ConfigFactory.pm
View File

@ -347,7 +347,7 @@ sub resolve_at_variable {
or croak "There is no group named '$group_name' that ", or croak "There is no group named '$group_name' that ",
"can be used to resolve '$option_name' for test '$self->{testname}'"; "can be used to resolve '$option_name' for test '$self->{testname}'";
my $value= $from_group->value($option_name); my $value= $from_group->value($option_name) || '';
$res .= $before.$value; $res .= $before.$value;
} }
$res .= $after; $res .= $after;

2
mysql-test/suite/s3/my.cnf
View File

@ -3,7 +3,7 @@
[mysqld.1] [mysqld.1]
plugin-maturity = alpha plugin-maturity = alpha
plugin-load-add=ha_s3 plugin-load-add=@ENV.HA_S3_SO
s3=ON s3=ON
#s3-host-name=s3.amazonaws.com #s3-host-name=s3.amazonaws.com
#s3-protocol-version=Amazon #s3-protocol-version=Amazon

2
mysql-test/suite/s3/no_s3.result
View File

@ -9,5 +9,3 @@ ERROR 42000: Table 's3_unique_table' uses an extension that doesn't exist in thi
rename table s3_unique_table to t1; rename table s3_unique_table to t1;
ERROR HY000: Error on rename of './test/s3_unique_table' to './test/t1' (errno: 138 "Unsupported extension used for table") ERROR HY000: Error on rename of './test/s3_unique_table' to './test/t1' (errno: 138 "Unsupported extension used for table")
drop table s3_unique_table; drop table s3_unique_table;
Warnings:
Warning 1112 Table 's3_unique_table' uses an extension that doesn't exist in this MariaDB version

2
mysql-test/suite/s3/slave.cnf
View File

@ -1,6 +1,6 @@
[mysqld.2] [mysqld.2]
plugin-maturity = alpha plugin-maturity = alpha
plugin-load-add=ha_s3 plugin-load-add=@ENV.HA_S3_SO
s3=ON s3=ON
#s3-host-name=s3.amazonaws.com #s3-host-name=s3.amazonaws.com
#s3-protocol-version=Amazon #s3-protocol-version=Amazon