mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-16 20:07:13 +02:00
Code Issues Projects Releases Packages Wiki Activity

MDEV-25180 fixup: Assertion table->def_trx_id == trx->id... failed in row_merge_drop_indexes()

Browse source 
We must invoke online_retry_drop_indexes() before
ha_innobase_inplace_ctx::trx->id is assigned.
This commit is contained in:
Marko Mäkelä 2021-06-09 16:58:52 +03:00
commit 3f78fbc582
1 changed files with 22 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -8073,6 +8073,12 @@ err_exit:
== ALTER_OPTIONS
&& !alter_options_need_rebuild(ha_alter_info, table))) {
DBUG_ASSERT(!m_prebuilt->trx->dict_operation_lock_mode);
if (ha_alter_info->handler_flags & ~INNOBASE_INPLACE_IGNORE) {
online_retry_drop_indexes(m_prebuilt->table,
m_user_thd);
}
if (heap) {
ha_alter_info->handler_ctx
= new ha_innobase_inplace_ctx(
@ -8089,14 +8095,6 @@ err_exit:
alt_opt.page_compression_level);
}
DBUG_ASSERT(m_prebuilt->trx->dict_operation_lock_mode == 0);
if (ha_alter_info->handler_flags & ~(INNOBASE_INPLACE_IGNORE)) {
online_retry_drop_indexes(
m_prebuilt->table, m_user_thd);
}
if ((ha_alter_info->handler_flags
& ALTER_DROP_VIRTUAL_COLUMN)
&& prepare_inplace_drop_virtual(ha_alter_info, table)) {
@ -11119,7 +11117,22 @@ ha_innobase::commit_inplace_alter_table(
ut_ad(trx_state_eq(trx, TRX_STATE_ACTIVE));
ut_ad(!new_clustered || trx->has_logged());
/* The SQL layer recovery of ALTER TABLE will invoke
innodb_check_version() to know whether our trx->id, which we
reported via ha_innobase::table_version() after
ha_innobase::prepare_inplace_alter_table(), was committed.
If this trx was committed (the log write below completed),
we will be able to recover our trx->id to
dict_table_t::def_trx_id from the data dictionary tables.
For this logic to work, purge_sys.stop_SYS() and
purge_sys.resume_SYS() will ensure that the DB_TRX_ID that we
wrote to the SYS_ tables will be preserved until the SQL layer
has durably marked the ALTER TABLE operation as completed.
During recovery, the purge of InnoDB transaction history will
not start until innodb_ddl_recovery_done(). */
ha_alter_info->inplace_alter_table_committed =
purge_sys.resume_SYS;
purge_sys.stop_SYS();