diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-09-22 18:01:41 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-09-22 18:01:41 +0300 |
| commit | b46cf33ab8ce869af0f51c35026965d237d722c7 (patch) | |
| tree | 2c89cb26f83f47424279f2535fbc8eddd6f09d38 /storage/innobase/row | |
| parent | 9fc1ef932f0b7499724cfcf76bd0f298f135018f (diff) | |
| parent | 1cb218c37cc3fe01a1ff2fe9b1cbfb591e90d5ce (diff) | |
| download | mariadb-git-b46cf33ab8ce869af0f51c35026965d237d722c7.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'storage/innobase/row')
| -rw-r--r-- | storage/innobase/row/row0ftsort.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/innobase/row/row0ftsort.cc b/storage/innobase/row/row0ftsort.cc index 68f721248b9..811a08b6a58 100644 --- a/storage/innobase/row/row0ftsort.cc +++ b/storage/innobase/row/row0ftsort.cc @@ -1665,7 +1665,6 @@ row_fts_merge_insert( aux_table = dict_table_open_on_name(aux_table_name, FALSE, FALSE, DICT_ERR_IGNORE_NONE); ut_ad(aux_table != NULL); - dict_table_close(aux_table, FALSE, FALSE); aux_index = dict_table_get_first_index(aux_table); ut_ad(!aux_index->is_instant()); @@ -1792,6 +1791,8 @@ row_fts_merge_insert( } exit: + dict_table_close(aux_table, FALSE, FALSE); + fts_sql_commit(trx); trx->op_info = ""; |