diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2021-08-02 10:11:41 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2021-08-02 10:11:41 +0200 |
| commit | 6efb5e9f5e3cd3ec811ae832a67e1878c14f0dea (patch) | |
| tree | b7c1a18b8bbc638ee12951d1d04db6d21bebcaed /mysql-test/suite/s3 | |
| parent | 07674e6a741a82d2e30f9798f699209a6c34dfef (diff) | |
| parent | ec8882b9ddbba2f9fc3571a1ac2ade0dabf412d9 (diff) | |
| download | mariadb-git-6efb5e9f5e3cd3ec811ae832a67e1878c14f0dea.tar.gz | |
Merge branch '10.5' into 10.6
Diffstat (limited to 'mysql-test/suite/s3')
| -rw-r--r-- | mysql-test/suite/s3/my.cnf | 1 | ||||
| -rw-r--r-- | mysql-test/suite/s3/slave.cnf | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/mysql-test/suite/s3/my.cnf b/mysql-test/suite/s3/my.cnf index 487aa65230f..f851aa18d6d 100644 --- a/mysql-test/suite/s3/my.cnf +++ b/mysql-test/suite/s3/my.cnf @@ -2,7 +2,6 @@ !include include/default_client.cnf [mysqld.1] -plugin-maturity = gamma plugin-load-add=@ENV.HA_S3_SO s3=ON s3-host-name=@ENV.S3_HOST_NAME diff --git a/mysql-test/suite/s3/slave.cnf b/mysql-test/suite/s3/slave.cnf index 28dc8572b30..4f4d3d39ac7 100644 --- a/mysql-test/suite/s3/slave.cnf +++ b/mysql-test/suite/s3/slave.cnf @@ -1,5 +1,4 @@ [mysqld.2] -plugin-maturity = gamma plugin-load-add=@ENV.HA_S3_SO s3=ON s3-slave-ignore-updates=1 |