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/std_data | |
| 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/std_data')
| -rw-r--r-- | mysql-test/std_data/bug47142_master-bin.000001 | bin | 386 -> 0 bytes | |||
| -rw-r--r-- | mysql-test/std_data/master-bin.000001 | bin | 98 -> 0 bytes | |||
| -rw-r--r-- | mysql-test/std_data/trunc_binlog.000001 | bin | 174 -> 0 bytes | |||
| -rwxr-xr-x | mysql-test/std_data/wsrep_notify_ssl.sh | 2 |
4 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/std_data/bug47142_master-bin.000001 b/mysql-test/std_data/bug47142_master-bin.000001 Binary files differdeleted file mode 100644 index d1a089a7..00000000 --- a/mysql-test/std_data/bug47142_master-bin.000001 +++ /dev/null diff --git a/mysql-test/std_data/master-bin.000001 b/mysql-test/std_data/master-bin.000001 Binary files differdeleted file mode 100644 index 2ec2397a..00000000 --- a/mysql-test/std_data/master-bin.000001 +++ /dev/null diff --git a/mysql-test/std_data/trunc_binlog.000001 b/mysql-test/std_data/trunc_binlog.000001 Binary files differdeleted file mode 100644 index 3da2490e..00000000 --- a/mysql-test/std_data/trunc_binlog.000001 +++ /dev/null diff --git a/mysql-test/std_data/wsrep_notify_ssl.sh b/mysql-test/std_data/wsrep_notify_ssl.sh index 12dc939e..d259ec4b 100755 --- a/mysql-test/std_data/wsrep_notify_ssl.sh +++ b/mysql-test/std_data/wsrep_notify_ssl.sh @@ -186,6 +186,8 @@ then "$ssl_verify_server_cert" = "on" ] then SSL_PARAM="$SSL_PARAM --ssl-verify-server-cert" + else + SSL_PARAM="$SSL_PARAM --disable-ssl-verify-server-cert" fi fi fi |