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/engines/funcs/t | |
| 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/engines/funcs/t')
| -rw-r--r-- | mysql-test/suite/engines/funcs/t/rpl_dual_pos_advance.test | 3 | ||||
| -rw-r--r-- | mysql-test/suite/engines/funcs/t/rpl_flushlog_loop.test | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/mysql-test/suite/engines/funcs/t/rpl_dual_pos_advance.test b/mysql-test/suite/engines/funcs/t/rpl_dual_pos_advance.test index bf5e8415..a61904ed 100644 --- a/mysql-test/suite/engines/funcs/t/rpl_dual_pos_advance.test +++ b/mysql-test/suite/engines/funcs/t/rpl_dual_pos_advance.test @@ -16,7 +16,7 @@ reset master; connection master; --replace_result $SLAVE_MYPORT SLAVE_PORT -eval change master to master_host="127.0.0.1",master_port=$SLAVE_MYPORT,master_user="root"; +eval change master to master_host="127.0.0.1",master_port=$SLAVE_MYPORT,master_user="root",master_ssl_verify_server_cert=0; --source include/start_slave.inc @@ -100,6 +100,7 @@ reset slave; drop table t1,t4,t5,t6; # add t2 and t3 later --sync_slave_with_master +--source include/wait_for_slave_to_start.inc # End of 4.1 tests --source include/rpl_end.inc diff --git a/mysql-test/suite/engines/funcs/t/rpl_flushlog_loop.test b/mysql-test/suite/engines/funcs/t/rpl_flushlog_loop.test index b4742246..38da16ff 100644 --- a/mysql-test/suite/engines/funcs/t/rpl_flushlog_loop.test +++ b/mysql-test/suite/engines/funcs/t/rpl_flushlog_loop.test @@ -11,7 +11,7 @@ connection slave; --replace_result $MASTER_MYPORT MASTER_PORT eval change master to master_host='127.0.0.1',master_user='root', - master_password='',master_port=$MASTER_MYPORT; + master_password='',master_port=$MASTER_MYPORT, master_ssl_verify_server_cert=0; --source include/start_slave.inc # # Start replication slave -> master @@ -20,7 +20,7 @@ connection master; --replace_result $SLAVE_MYPORT SLAVE_PORT eval change master to master_host='127.0.0.1',master_user='root', - master_password='',master_port=$SLAVE_MYPORT; + master_password='',master_port=$SLAVE_MYPORT, master_ssl_verify_server_cert=0; --source include/start_slave.inc # |