diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-12-13 16:58:58 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-12-13 16:58:58 +0200 |
| commit | a8a5c8a1b8ac566241d43a85de90c11f5d1568d9 (patch) | |
| tree | f619f2a7ed54abbc9edd42b77f5b63caa6ec65ac /sql/field.h | |
| parent | 04efe13501246e490932d4be7bca90e207e0b5e2 (diff) | |
| parent | 1dc2f35598193fc52b79061c286b61f01c617374 (diff) | |
| download | mariadb-git-a8a5c8a1b8ac566241d43a85de90c11f5d1568d9.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'sql/field.h')
| -rw-r--r-- | sql/field.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sql/field.h b/sql/field.h index 8d34e259fea..25c880c5aba 100644 --- a/sql/field.h +++ b/sql/field.h @@ -519,6 +519,8 @@ enum enum_vcol_info_type VCOL_DEFAULT, VCOL_CHECK_FIELD, VCOL_CHECK_TABLE, VCOL_USING_HASH, /* Additional types should be added here */ + + VCOL_GENERATED_VIRTUAL_INDEXED, // this is never written in .frm /* Following is the highest value last */ VCOL_TYPE_NONE = 127 // Since the 0 value is already in use }; @@ -528,6 +530,7 @@ static inline const char *vcol_type_name(enum_vcol_info_type type) switch (type) { case VCOL_GENERATED_VIRTUAL: + case VCOL_GENERATED_VIRTUAL_INDEXED: case VCOL_GENERATED_STORED: return "GENERATED ALWAYS AS"; case VCOL_DEFAULT: @@ -551,10 +554,10 @@ static inline const char *vcol_type_name(enum_vcol_info_type type) #define VCOL_FIELD_REF 1 #define VCOL_NON_DETERMINISTIC 2 #define VCOL_SESSION_FUNC 4 /* uses session data, e.g. USER or DAYNAME */ -#define VCOL_TIME_FUNC 8 +#define VCOL_TIME_FUNC 8 /* safe for SBR */ #define VCOL_AUTO_INC 16 #define VCOL_IMPOSSIBLE 32 -#define VCOL_NOT_VIRTUAL 64 /* Function can't be virtual */ +#define VCOL_NEXTVAL 64 /* NEXTVAL is not implemented for vcols */ #define VCOL_CHECK_CONSTRAINT_IF_NOT_EXISTS 128 #define VCOL_NOT_STRICTLY_DETERMINISTIC \ @@ -5890,5 +5893,4 @@ ulonglong TABLE::vers_start_id() const return static_cast<ulonglong>(vers_start_field()->val_int()); } - #endif /* FIELD_INCLUDED */ |