diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-11-01 10:33:44 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-11-01 10:33:44 +0100 |
| commit | ebf2121529fcf06971b4c0fc28f40654ef8dd99f (patch) | |
| tree | 420ddcc5b2aeae06a75224062e85ee8b1ffce504 /include/my_base.h | |
| parent | 4b87d3628acf815836c0efc84fbcd878517d9b89 (diff) | |
| parent | e0421b7cc8969edefca25c9a47e24f7e77c4bdf6 (diff) | |
| download | mariadb-git-ebf2121529fcf06971b4c0fc28f40654ef8dd99f.tar.gz | |
Merge branch '10.8' into 10.9
Diffstat (limited to 'include/my_base.h')
| -rw-r--r-- | include/my_base.h | 4 |
1 files changed, 2 insertions, 2 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) /* |