diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-11-01 10:42:22 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-11-01 11:55:28 +0100 |
| commit | 49a22c5897823c528d52886f6048d5b4c91e221f (patch) | |
| tree | 92eedca678276458a7c4e27f357acd12d4fdcbac /include | |
| parent | 8e6a64194b76a199b0bbf2edc9a4e9facda8da2c (diff) | |
| parent | ebf2121529fcf06971b4c0fc28f40654ef8dd99f (diff) | |
| download | mariadb-git-49a22c5897823c528d52886f6048d5b4c91e221f.tar.gz | |
Merge branch '10.9' into 10.10
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_base.h | 4 | ||||
| -rw-r--r-- | include/mysql/service_encryption.h | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/include/my_base.h b/include/my_base.h index 388eab97d44..1b71cdc3517 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -278,8 +278,8 @@ enum ha_base_keytype { #define HA_GENERATED_KEY 8192U /* Automatically generated key */ /* The combination of the above can be used for key type comparison. */ -#define HA_KEYFLAG_MASK (HA_NOSAME | HA_PACK_KEY | HA_AUTO_KEY | \ - HA_BINARY_PACK_KEY | HA_FULLTEXT | HA_UNIQUE_CHECK | \ +#define HA_KEYFLAG_MASK (HA_NOSAME | HA_AUTO_KEY | \ + HA_FULLTEXT | HA_UNIQUE_CHECK | \ HA_SPATIAL | HA_NULL_ARE_EQUAL | HA_GENERATED_KEY) /* 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) |