diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-11-09 09:11:50 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-11-09 09:11:50 +0200 |
| commit | 25ac047bafefa582ff082d1ad1783e5ff3865c20 (patch) | |
| tree | 7ce818faf8d0cf7b9c84602626ed6b10ef84c314 /sql/field.h | |
| parent | 96f853260669bb67ab7a336e67d29f7221377cd3 (diff) | |
| parent | 9c18b9660302a76a6ff9bd505888048a13586a4c (diff) | |
| download | mariadb-git-25ac047bafefa582ff082d1ad1783e5ff3865c20.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'sql/field.h')
| -rw-r--r-- | sql/field.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/field.h b/sql/field.h index 0b8f317b5b8..7be16a1457e 100644 --- a/sql/field.h +++ b/sql/field.h @@ -517,6 +517,7 @@ enum enum_vcol_info_type { VCOL_GENERATED_VIRTUAL, VCOL_GENERATED_STORED, VCOL_DEFAULT, VCOL_CHECK_FIELD, VCOL_CHECK_TABLE, + VCOL_USING_HASH, /* Additional types should be added here */ /* Following is the highest value last */ VCOL_TYPE_NONE = 127 // Since the 0 value is already in use @@ -534,6 +535,8 @@ static inline const char *vcol_type_name(enum_vcol_info_type type) case VCOL_CHECK_FIELD: case VCOL_CHECK_TABLE: return "CHECK"; + case VCOL_USING_HASH: + return "USING HASH"; case VCOL_TYPE_NONE: return "UNTYPED"; } |