diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-10-25 14:25:42 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-10-25 14:25:42 +0300 |
| commit | aeccbbd926e759a5c3b9818d9948a35918404478 (patch) | |
| tree | e3ee68a92d2c77f986979e1638169280ede35a96 /include/mysql | |
| parent | 75f7c5681c2592b50c26feff2371bd7ee973e535 (diff) | |
| parent | 4b4c2b8cc0da949895292121ed5ef3e0c2dbaae1 (diff) | |
| download | mariadb-git-aeccbbd926e759a5c3b9818d9948a35918404478.tar.gz | |
Merge 10.5 into 10.6
To prevent ASAN heap-use-after-poison in the MDEV-16549 part of
./mtr --repeat=6 main.derived
the initialization of Name_resolution_context was cleaned up.
Diffstat (limited to 'include/mysql')
| -rw-r--r-- | include/mysql/service_encryption.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/mysql/service_encryption.h b/include/mysql/service_encryption.h index a4e908f9aff..69d205a27e8 100644 --- a/include/mysql/service_encryption.h +++ b/include/mysql/service_encryption.h @@ -34,12 +34,13 @@ extern "C" { #ifndef __cplusplus #define inline __inline #endif -#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) -#include <stdlib.h> #else +#include <stdlib.h> +#ifdef HAVE_ALLOCA_H #include <alloca.h> #endif #endif +#endif /* returned from encryption_key_get_latest_version() */ #define ENCRYPTION_KEY_VERSION_INVALID (~(unsigned int)0) |