diff options
Diffstat (limited to 'sql/table.h')
| -rw-r--r-- | sql/table.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sql/table.h b/sql/table.h index 42c017d63af..da7e0b4a99e 100644 --- a/sql/table.h +++ b/sql/table.h @@ -1167,6 +1167,9 @@ public: /* Table's triggers, 0 if there are no of them */ Table_triggers_list *triggers; TABLE_LIST *pos_in_table_list;/* Element referring to this table */ + /* This is same as pos_in_table_list, but it is set as soon as possible when + TABLE is allocated */ + TABLE_LIST *intention_pos_in_table_list; /* Position in thd->locked_table_list under LOCK TABLES */ TABLE_LIST *pos_in_locked_tables; /* Tables used in DEFAULT and CHECK CONSTRAINT (normally sequence tables) */ @@ -2144,6 +2147,9 @@ struct TABLE_LIST /* Index names in a "... JOIN ... USE/IGNORE INDEX ..." clause. */ List<Index_hint> *index_hints; TABLE *table; /* opened table */ + /* This is same as table, but it is set as soon as possible when + TABLE is allocated */ + TABLE *intention_table; ulonglong table_id; /* table id (from binlog) for opened table */ /* select_result for derived table to pass it from table creation to table @@ -2982,7 +2988,8 @@ enum open_frm_error open_table_from_share(THD *thd, TABLE_SHARE *share, const LEX_CSTRING *alias, uint db_stat, uint prgflag, uint ha_open_flags, TABLE *outparam, bool is_create_table, - List<String> *partitions_to_open= NULL); + List<String> *partitions_to_open= NULL, + TABLE_LIST *table_list= NULL); 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); |