revision-id: b173e883f7fd4929c1504db69c09feb6d8fca2ed (mariadb-10.1.35-75-gb173e883f7f) parent(s): 6dff1cfdca947315c0857074c3e9ca075402f90c author: Jan Lindström committer: Jan Lindström timestamp: 2018-10-03 10:24:33 +0300 message: MDEV-16656: DROP DATABASE crashes the Galera Cluster Restore incorrectly removed call fts_sql_rollback(trx_rename); --- storage/innobase/fts/fts0fts.cc | 1 + storage/xtradb/fts/fts0fts.cc | 1 + 2 files changed, 2 insertions(+) diff --git a/storage/innobase/fts/fts0fts.cc b/storage/innobase/fts/fts0fts.cc index 04aaff96b91..4aeb2746d48 100644 --- a/storage/innobase/fts/fts0fts.cc +++ b/storage/innobase/fts/fts0fts.cc @@ -6665,6 +6665,7 @@ fts_rename_aux_tables_to_hex_format( "All the fts index associated with the table are " "marked as corrupted. Please rebuild the " "index again.", parent_table->name); + fts_sql_rollback(trx_rename); /* Corrupting the fts index related to parent table. */ trx_t* trx_corrupt; diff --git a/storage/xtradb/fts/fts0fts.cc b/storage/xtradb/fts/fts0fts.cc index d5128955f56..cc7f4f20267 100644 --- a/storage/xtradb/fts/fts0fts.cc +++ b/storage/xtradb/fts/fts0fts.cc @@ -6664,6 +6664,7 @@ fts_rename_aux_tables_to_hex_format( "All the fts index associated with the table are " "marked as corrupted. Please rebuild the " "index again.", parent_table->name); + fts_sql_rollback(trx_rename); /* Corrupting the fts index related to parent table. */ trx_t* trx_corrupt;