diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-02-03 17:01:31 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-02-03 17:01:31 +0100 |
| commit | f5c5f8e41ecd4d407022d3772ac43075c16824a5 (patch) | |
| tree | 8a46fbd9dfd51352800ea606ae52a53ceb239501 /extra | |
| parent | 8d742fe4acb91652fcbeb36506d20ead4ff19e83 (diff) | |
| parent | cf63eecef44f189ce2d221612dee9dfc1885ba4e (diff) | |
| download | mariadb-git-f5c5f8e41ecd4d407022d3772ac43075c16824a5.tar.gz | |
Merge branch '10.5' into 10.6
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/innochecksum.cc | 6 | ||||
| -rw-r--r-- | extra/wolfssl/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | extra/wolfssl/user_settings.h.in | 1 | ||||
| m--------- | extra/wolfssl/wolfssl | 0 |
4 files changed, 8 insertions, 0 deletions
diff --git a/extra/innochecksum.cc b/extra/innochecksum.cc index ce3911502fb..6c732dbdb48 100644 --- a/extra/innochecksum.cc +++ b/extra/innochecksum.cc @@ -53,6 +53,12 @@ The parts not included are excluded by #ifndef UNIV_INNOCHECKSUM. */ #include <string.h> +#ifdef UNIV_NONINL +# include "fsp0fsp.inl" +# include "mach0data.inl" +# include "ut0rnd.inl" +#endif + #ifndef PRIuMAX #define PRIuMAX "llu" #endif diff --git a/extra/wolfssl/CMakeLists.txt b/extra/wolfssl/CMakeLists.txt index b38d57d3710..c992c358e38 100644 --- a/extra/wolfssl/CMakeLists.txt +++ b/extra/wolfssl/CMakeLists.txt @@ -104,6 +104,7 @@ ${WOLFCRYPT_SRCDIR}/wc_port.c ${WOLFCRYPT_SRCDIR}/wc_encrypt.c ${WOLFCRYPT_SRCDIR}/hash.c ${WOLFCRYPT_SRCDIR}/wolfmath.c +${WOLFCRYPT_SRCDIR}/kdf.c ) # Use fastmath large number math library. diff --git a/extra/wolfssl/user_settings.h.in b/extra/wolfssl/user_settings.h.in index 55b43655659..bbe8c820019 100644 --- a/extra/wolfssl/user_settings.h.in +++ b/extra/wolfssl/user_settings.h.in @@ -2,6 +2,7 @@ #define WOLFSSL_USER_SETTINGS_H #define HAVE_CRL +#define WOLFSSL_HAVE_ERROR_QUEUE #define WOLFSSL_MYSQL_COMPATIBLE #define HAVE_ECC #define ECC_TIMING_RESISTANT diff --git a/extra/wolfssl/wolfssl b/extra/wolfssl/wolfssl -Subproject 723ed009ae5dc68acc14cd7664f93503d64cd51 +Subproject c3513bf2573c30f6d2df815de216120e9214202 |