diff options
| author | Monty <monty@mariadb.org> | 2017-12-22 14:34:41 +0200 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2017-12-22 14:56:58 +0200 |
| commit | 5b4c8469d5e1988f6f7408fa6c7cc54f9bb1f290 (patch) | |
| tree | ea9a80136032795037043cc6dd83a07e6c2eaaf4 /sql/field.h | |
| parent | 139e8afc2c165a08f4fa13da70b0aad3cf7b9df5 (diff) | |
| download | mariadb-git-5b4c8469d5e1988f6f7408fa6c7cc54f9bb1f290.tar.gz | |
Added CHECK_FIELD_EXPRESSION
This is needed for MDEV 13679 Enabled sequences to be used in DEFAULT
Added new option for count_cuted_fields: CHECK_FIELD_EXPRESSION
which is used to check if a DEFAULT expression is correct before
ALTER TABLE starts
Changed also all test:
if (thd->count_cuted_fields)
to
if (thd->count_cuted_fields > CHECK_FIELD_EXPRESSION)
Diffstat (limited to 'sql/field.h')
| -rw-r--r-- | sql/field.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/field.h b/sql/field.h index 2bbea486754..0bff381360b 100644 --- a/sql/field.h +++ b/sql/field.h @@ -50,8 +50,9 @@ class Virtual_tmp_table; enum enum_check_fields { CHECK_FIELD_IGNORE, + CHECK_FIELD_EXPRESSION, CHECK_FIELD_WARN, - CHECK_FIELD_ERROR_FOR_NULL + CHECK_FIELD_ERROR_FOR_NULL, }; /* @@ -558,6 +559,7 @@ static inline const char *vcol_type_name(enum_vcol_info_type type) #define VCOL_TIME_FUNC 8 #define VCOL_AUTO_INC 16 #define VCOL_IMPOSSIBLE 32 +#define VCOL_NOT_VIRTUAL 64 /* Function can't be virtual */ #define VCOL_NOT_STRICTLY_DETERMINISTIC \ (VCOL_NON_DETERMINISTIC | VCOL_TIME_FUNC | VCOL_SESSION_FUNC) |