diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-06-02 16:51:13 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-06-02 16:51:13 +0300 |
| commit | 4b3c3e526e7067da921d0aef8451b6e2736a5fe0 (patch) | |
| tree | 40a6d851d7c39c443c587e29a725afda85c65929 /sql/table.h | |
| parent | e7de50a82187cbaaa192c2065d64c0041cd9a6a1 (diff) | |
| parent | 96f4b4a55b449a29af7e4b70bebf0ff238ae7f80 (diff) | |
| download | mariadb-git-4b3c3e526e7067da921d0aef8451b6e2736a5fe0.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/table.h')
| -rw-r--r-- | sql/table.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sql/table.h b/sql/table.h index dbdeefafdb7..8a9b4c46a47 100644 --- a/sql/table.h +++ b/sql/table.h @@ -1,7 +1,7 @@ #ifndef TABLE_INCLUDED #define TABLE_INCLUDED /* Copyright (c) 2000, 2017, Oracle and/or its affiliates. - Copyright (c) 2009, 2021, MariaDB + Copyright (c) 2009, 2022, MariaDB This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -3171,9 +3171,6 @@ enum open_frm_error open_table_from_share(THD *thd, TABLE_SHARE *share, bool is_create_table, List<String> *partitions_to_open= NULL); bool copy_keys_from_share(TABLE *outparam, MEM_ROOT *root); -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, vcol_init_mode expr); TABLE_SHARE *alloc_table_share(const char *db, const char *table_name, |