database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge 10.4 into 10.5

Browse Source
This commit is contained in:
Marko Mäkelä
2021-11-09 08:50:33 +02:00
parent d8d6e99528 47ab793d71
commit 9c18b96603
46 changed files with 1536 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/field.h
View File

@ -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";
}