diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-12-13 17:30:37 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-12-13 17:30:37 +0200 |
| commit | 8fa759a5762733d9f8a4050437fadcd255ecd1a2 (patch) | |
| tree | 093c167478abbbf6f51cd47f8df8651ee17f97f1 /include | |
| parent | 014e1258309da2475b8ae36d445261f87422adaf (diff) | |
| parent | 3466b47b0d2f0aca0a2191574c593c7eaea0b0b8 (diff) | |
| download | mariadb-git-8fa759a5762733d9f8a4050437fadcd255ecd1a2.tar.gz | |
Merge 10.3 into 10.4
We disable the MDEV-21189 test galera.galera_partition
because it times out.
Diffstat (limited to 'include')
| -rw-r--r-- | include/sslopt-case.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/sslopt-case.h b/include/sslopt-case.h index 87eeff28231..72881a266ab 100644 --- a/include/sslopt-case.h +++ b/include/sslopt-case.h @@ -29,8 +29,8 @@ One can disable SSL later by using --skip-ssl or --ssl=0 */ opt_use_ssl= 1; -#ifdef HAVE_WOLFSSL - /* CRL does not work with WolfSSL */ +#if defined (HAVE_WOLFSSL) && (!defined (_WIN32) || defined (MYSQL_SERVER)) + /* CRL does not work with WolfSSL */ opt_ssl_crl= NULL; opt_ssl_crlpath= NULL; #endif |