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/sql_base.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/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 60371813280..54bf3bf29f2 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -2040,11 +2040,13 @@ retry_share: if (!(table=(TABLE*) my_malloc(sizeof(*table),MYF(MY_WME)))) goto err_lock; + table_list->intention_table= table; error= open_table_from_share(thd, share, &table_list->alias, HA_OPEN_KEYFILE | HA_TRY_READ_ONLY, EXTRA_RECORD, thd->open_options, table, FALSE, - IF_PARTITIONING(table_list->partition_names,0)); + IF_PARTITIONING(table_list->partition_names,0), + table_list); if (unlikely(error)) { |