mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-30 02:30:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDEV-26012 InnoDB purge and shutdown hangs after failed ALTER TABLE

Browse source 
ha_innobase::commit_inplace_alter_table(): Invoke
purge_sys.resume_FTS() on all error handling paths
if purge_sys.stop_FTS() had been called.

This fixes a regression that had been introduced in
commit 1bd681c8b3 (MDEV-25506).
This commit is contained in:
Marko Mäkelä 2021-06-24 16:07:27 +03:00
parent 033e29b6a1
commit 82fe83a34c
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
storage/innobase/handler/handler0alter.cc
View file

@ -10885,6 +10885,9 @@ ha_innobase::commit_inplace_alter_table(
lock_fail:
my_error_innodb(
error, table_share->table_name.str, 0);
if (fts_exist) {
purge_sys.resume_FTS();
}
DBUG_RETURN(true);
} else if ((ctx->new_table->flags2
& (DICT_TF2_FTS_HAS_DOC_ID | DICT_TF2_FTS))
@ -10916,6 +10919,9 @@ lock_fail:
DBUG_ASSERT(ctx->need_rebuild());
if (alter_rebuild_apply_log(ctx, ha_alter_info,
altered_table)) {
if (fts_exist) {
purge_sys.resume_FTS();
}
DBUG_RETURN(true);
}
}