diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-07-01 18:15:00 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-07-01 18:15:00 +0000 |
commit | a2a2e32c02643a0cec111511220227703fda1cd5 (patch) | |
tree | 69cc2b631234c2a8e026b9cd4d72676c61c594df /mysql-test/suite/binlog_encryption/multisource.result | |
parent | Releasing progress-linux version 1:10.11.8-1~progress7.99u1. (diff) | |
download | mariadb-a2a2e32c02643a0cec111511220227703fda1cd5.tar.xz mariadb-a2a2e32c02643a0cec111511220227703fda1cd5.zip |
Merging upstream version 1:11.4.2.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'mysql-test/suite/binlog_encryption/multisource.result')
-rw-r--r-- | mysql-test/suite/binlog_encryption/multisource.result | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mysql-test/suite/binlog_encryption/multisource.result b/mysql-test/suite/binlog_encryption/multisource.result index 4b53b465..ca420f9a 100644 --- a/mysql-test/suite/binlog_encryption/multisource.result +++ b/mysql-test/suite/binlog_encryption/multisource.result @@ -6,7 +6,8 @@ ERROR HY000: Incorrect arguments to MASTER_HOST change master 'master1' to master_port=MYPORT_1, master_host='127.0.0.1', -master_user='root'; +master_user='root', +master_ssl_verify_server_cert=0; start slave 'master1'; set default_master_connection = 'master1'; include/wait_for_slave_to_start.inc @@ -100,6 +101,7 @@ change master to master_port=MYPORT_2, master_host='127.0.0.1', master_user='root', +master_ssl_verify_server_cert=0, master_use_gtid=no; start slave; include/wait_for_slave_to_start.inc |