diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-09-24 14:38:52 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-09-24 14:38:52 +0300 |
| commit | d95361107c07b6e8257a7a82c41b18af64ab8d89 (patch) | |
| tree | 92df0d7f2670e1ec41e62e21741bd121beeceacb /storage/innobase/row | |
| parent | 37a074f6c35af22f403b3e1d150c17e8ab07f164 (diff) | |
| parent | 88f38661b75e68ed255491ed51e52e73cfe06011 (diff) | |
| download | mariadb-git-d95361107c07b6e8257a7a82c41b18af64ab8d89.tar.gz | |
Merge 10.5 into 10.6
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 792a9b46e8a..e116c9efc98 100644 --- a/storage/innobase/row/row0ftsort.cc +++ b/storage/innobase/row/row0ftsort.cc @@ -1637,7 +1637,6 @@ row_fts_merge_insert( aux_table = dict_table_open_on_name(aux_table_name, false, DICT_ERR_IGNORE_NONE); ut_ad(aux_table != NULL); - aux_table->release(); aux_index = dict_table_get_first_index(aux_table); ut_ad(!aux_index->is_instant()); @@ -1762,6 +1761,8 @@ row_fts_merge_insert( } exit: + aux_table->release(); + fts_sql_commit(trx); trx->op_info = ""; |