diff options
| author | Kentoku <kentokushiba@gmail.com> | 2019-05-28 16:40:59 +0900 |
|---|---|---|
| committer | Kentoku <kentokushiba@gmail.com> | 2019-09-02 07:06:05 +0900 |
| commit | 4a8dafe26ec1aa97c153f7dedc7a487b6cedffd9 (patch) | |
| tree | 101a557ddf6adbc4d76deac240d6a1dcf52f06c9 /sql/table.cc | |
| parent | 24773bf38024d32c9af4e6bc09e67043318bba6e (diff) | |
| download | mariadb-git-bb-10.4-MDEV-6268.tar.gz | |
MDEV-6268 SPIDER table with no COMMENT clause causes queries to wait foreverbb-10.4-MDEV-6268
Add loop checks by using user variables
Diffstat (limited to 'sql/table.cc')
| -rw-r--r-- | sql/table.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/table.cc b/sql/table.cc index 699102885c2..ffc00158956 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -3543,7 +3543,8 @@ static void print_long_unique_table(TABLE *table) 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) + bool is_create_table, List<String> *partitions_to_open, + TABLE_LIST *table_list) { enum open_frm_error error; uint records, i, bitmap_size, bitmap_count; @@ -3565,6 +3566,7 @@ enum open_frm_error open_table_from_share(THD *thd, TABLE_SHARE *share, outparam->s= share; outparam->db_stat= db_stat; outparam->write_row_record= NULL; + outparam->intention_pos_in_table_list= table_list; if (share->incompatible_version && !(ha_open_flags & (HA_OPEN_FOR_ALTER | HA_OPEN_FOR_REPAIR))) |