diff options
| author | Alexander Barkov <bar@mariadb.com> | 2019-09-04 09:55:59 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2019-09-04 10:19:58 +0400 |
| commit | 7e08ac0b41b50195aa79f6ac185bc69a91a960ca (patch) | |
| tree | 3a399827dc8e6bd89bbb6d142f21eda8bd659119 /sql/table.h | |
| parent | a071e0e029cd7c155cff1054d9f7f8a6aa898620 (diff) | |
| parent | ef00ac4c86daf3294c46a45358da636763fb0049 (diff) | |
| download | mariadb-git-7e08ac0b41b50195aa79f6ac185bc69a91a960ca.tar.gz | |
Merge 10.2 (up to commit ef00ac4c86daf3294c46a45358da636763fb0049) into 10.3
Diffstat (limited to 'sql/table.h')
| -rw-r--r-- | sql/table.h | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/sql/table.h b/sql/table.h index 17c4719a3fa..d5a735de5ed 100644 --- a/sql/table.h +++ b/sql/table.h @@ -326,6 +326,20 @@ enum tmp_table_type }; enum release_type { RELEASE_NORMAL, RELEASE_WAIT_FOR_DROP }; + +enum vcol_init_mode +{ + VCOL_INIT_DEPENDENCY_FAILURE_IS_WARNING= 1, + VCOL_INIT_DEPENDENCY_FAILURE_IS_ERROR= 2 + /* + There may be new flags here. + e.g. to automatically remove sql_mode dependency: + GENERATED ALWAYS AS (char_col) -> + GENERATED ALWAYS AS (RTRIM(char_col)) + */ +}; + + enum enum_vcol_update_mode { VCOL_UPDATE_FOR_READ= 0, @@ -2920,7 +2934,7 @@ bool fix_session_vcol_expr(THD *thd, Virtual_column_info *vcol); bool fix_session_vcol_expr_for_read(THD *thd, Field *field, Virtual_column_info *vcol); bool parse_vcol_defs(THD *thd, MEM_ROOT *mem_root, TABLE *table, - bool *error_reported); + bool *error_reported, vcol_init_mode expr); TABLE_SHARE *alloc_table_share(const char *db, const char *table_name, const char *key, uint key_length); void init_tmp_table_share(THD *thd, TABLE_SHARE *share, const char *key, |