diff options
| author | Julius Goryavsky <julius.goryavsky@mariadb.com> | 2021-05-15 18:56:12 +0200 |
|---|---|---|
| committer | Julius Goryavsky <julius.goryavsky@mariadb.com> | 2021-05-15 18:56:12 +0200 |
| commit | a5164176718464ea86ce88c4c47d6f0f8662bac3 (patch) | |
| tree | cb27c75aa2e5464b81b36367af63999eddaeb159 | |
| parent | b2bb747f8cf56cf01dc571ffd8be195b95f0c0e8 (diff) | |
| download | mariadb-git-a5164176718464ea86ce88c4c47d6f0f8662bac3.tar.gz | |
MDEV-23580 post-fix: fixed minor inaccuracy of automatic merge (from 10.3 to 10.4)
3 files changed, 2 insertions, 4 deletions
diff --git a/mysql-test/suite/galera/t/galera_sst_mariabackup_encrypt_with_key_server.cnf b/mysql-test/suite/galera/t/galera_sst_mariabackup_encrypt_with_key_server.cnf index 12fca48e065..274db497424 100644 --- a/mysql-test/suite/galera/t/galera_sst_mariabackup_encrypt_with_key_server.cnf +++ b/mysql-test/suite/galera/t/galera_sst_mariabackup_encrypt_with_key_server.cnf @@ -3,11 +3,11 @@ [mysqld] wsrep_sst_method=mariabackup wsrep_sst_auth="root:" -wsrep_debug=ON +wsrep_debug=1 ssl-cert=@ENV.MYSQL_TEST_DIR/std_data/client-cert.pem ssl-key=@ENV.MYSQL_TEST_DIR/std_data/client-key.pem ssl-ca=@ENV.MYSQL_TEST_DIR/std_data/cacert.pem [sst] -ssl-mode=VERIFY_CA
\ No newline at end of file +ssl-mode=VERIFY_CA diff --git a/mysql-test/suite/galera/t/galera_sst_rsync_encrypt_with_key.cnf b/mysql-test/suite/galera/t/galera_sst_rsync_encrypt_with_key.cnf index f131088f582..948b52d4bf7 100644 --- a/mysql-test/suite/galera/t/galera_sst_rsync_encrypt_with_key.cnf +++ b/mysql-test/suite/galera/t/galera_sst_rsync_encrypt_with_key.cnf @@ -12,4 +12,3 @@ wsrep_provider_options='base_port=@mysqld.1.#galera_port;gcache.size=1;pc.ignore [mysqld.2] wsrep_provider_options='base_port=@mysqld.2.#galera_port;gcache.size=1;pc.ignore_sb=true' - diff --git a/mysql-test/suite/galera/t/galera_sst_rsync_encrypt_with_server.cnf b/mysql-test/suite/galera/t/galera_sst_rsync_encrypt_with_server.cnf index 8e31e69a590..bc7f85888ab 100644 --- a/mysql-test/suite/galera/t/galera_sst_rsync_encrypt_with_server.cnf +++ b/mysql-test/suite/galera/t/galera_sst_rsync_encrypt_with_server.cnf @@ -14,4 +14,3 @@ wsrep_provider_options='base_port=@mysqld.1.#galera_port;gcache.size=1;pc.ignore [mysqld.2] wsrep_provider_options='base_port=@mysqld.2.#galera_port;gcache.size=1;pc.ignore_sb=true' - |