diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-03-28 15:25:52 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-03-28 15:25:52 +0300 |
commit | 0760ad3336521b85454b522390eb972a606def23 (patch) | |
tree | de6d7b7bc9923884b8095e4e5aa7ba17c68da27d /storage/innobase/row/row0merge.cc | |
parent | 216d99bb395c4fda43b4e3583672ef925103fae5 (diff) | |
parent | 402f36dd652b57a48d2d3e18949f5d7a1450363d (diff) | |
download | mariadb-git-0760ad3336521b85454b522390eb972a606def23.tar.gz |
Merge 10.5 into 10.6
Diffstat (limited to 'storage/innobase/row/row0merge.cc')
-rw-r--r-- | storage/innobase/row/row0merge.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/innobase/row/row0merge.cc b/storage/innobase/row/row0merge.cc index 535762ee105..70b51fbb812 100644 --- a/storage/innobase/row/row0merge.cc +++ b/storage/innobase/row/row0merge.cc @@ -3833,7 +3833,8 @@ static void row_merge_drop_fulltext_indexes(trx_t *trx, dict_table_t *table) fts_optimize_remove_table(table); fts_drop_tables(trx, *table); - fts_free(table); + table->fts->~fts_t(); + table->fts= nullptr; DICT_TF2_FLAG_UNSET(table, DICT_TF2_FTS); } |