diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-10-25 11:26:37 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-10-25 11:26:37 +0300 |
| commit | 9a0b9e336081619d88211d17895e3e7f8030ab3f (patch) | |
| tree | dff672703c5309b1e34227330ea027ab13e6c29a /include | |
| parent | 2f7a0072b6f343051fc2dbd77ea46519617b94ab (diff) | |
| parent | 667d3fbbb51044b20d23150992adbbad1f04aad8 (diff) | |
| download | mariadb-git-9a0b9e336081619d88211d17895e3e7f8030ab3f.tar.gz | |
Merge 10.4 into 10.5
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 c29e9de6e0d..2a420591873 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -276,8 +276,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) |