database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge branch '10.6' into 10.11

Browse Source
This commit is contained in:
Yuchen Pei
2024-09-12 10:44:13 +10:00
parent b168859d1e 09b1269e4a
commit a8c5717223
22 changed files with 857 additions and 4488 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/suite/s3/basic.result
View File

@@ -130,16 +130,19 @@ s3_block_size X
s3_bucket X
s3_debug X
s3_host_name X
s3_no_content_type X
s3_pagecache_age_threshold X
s3_pagecache_buffer_size X
s3_pagecache_division_limit X
s3_pagecache_file_hash_size X
s3_port X
s3_protocol_version X
s3_provider X
s3_region X
s3_replicate_alter_as_create_select X
s3_secret_key X
s3_slave_ignore_updates X
s3_ssl_no_verify X
s3_use_http X
show variables like "s3_slave%";
Variable_name Value

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

@@ -12,6 +12,8 @@ s3-secret-key=@ENV.S3_SECRET_KEY
s3-region=@ENV.S3_REGION
s3-port=@ENV.S3_PORT
s3-use-http=@ENV.S3_USE_HTTP
s3-ssl-no-verify=@ENV.S3_SSL_NO_VERIFY
s3-provider=@ENV.S3_PROVIDER
#s3-host-name=s3.amazonaws.com
#s3-protocol-version=Amazon

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

@@ -10,6 +10,8 @@ s3-secret-key=@ENV.S3_SECRET_KEY
s3-region=@ENV.S3_REGION
s3-port=@ENV.S3_PORT
s3-use-http=@ENV.S3_USE_HTTP
s3-ssl-no-verify=@ENV.S3_SSL_NO_VERIFY
s3-provider=@ENV.S3_PROVIDER
# You can change the following when running the tests against
# your own S3 setup

13
mysql-test/suite/s3/suite.pm
View File

@@ -20,6 +20,8 @@ if(connect(SOCK, $paddr))
$ENV{'S3_REGION'} = "";
$ENV{'S3_PROTOCOL_VERSION'} = "Auto";
$ENV{'S3_USE_HTTP'} = "ON";
$ENV{'S3_SSL_NO_VERIFY'} = "OFF";
$ENV{'S3_PROVIDER'} = "Default";
}
else
{
@@ -62,6 +64,17 @@ else
{
$ENV{'S3_USE_HTTP'} = "OFF";
}
if (!$ENV{'S3_SSL_NO_VERIFY'})
{
$ENV{'S3_SSL_NO_VERIFY'} = "OFF";
}
if (!$ENV{'S3_PROVIDER'})
{
$ENV{'S3_PROVIDER'} = "Default";
}
}
bless { };