From 6b35d6a9094df7108572a349ebe6da7b6bf0a999 Mon Sep 17 00:00:00 2001 From: Nikita Malyavin Date: Sun, 26 Mar 2023 00:26:05 +0300 Subject: [PATCH] MDEV-30925 Assertion failed in translog_write_record in ONLINE ALTER + Aria This is the corner case of ONLINE ALTER vs ha_maria vs App-time Periods. When a Delete_rows_event (or update) is executed, a lookup handler may be created, normally to serve long unique index needs, by a call of handler::prepare_for_insert. This function also creates a lookup handler if an application-time period exists in a table. A difference with a usual call of prepare_for_insert is that transactions are disabled for this table during ALTER TABLE. See mysql_trans_prepare_alter_copy_data call in copy_data_between_tables. Then, ha_maria calls _ma_tmp_disable_logging_for_table during ha_maria::external_lock. It never happened so before, that two handlers would be created for write to a single ha_maria table under transactions disabled. Hence, the fix handles this scenario. It could be done otherwise, by not creating this lookup handler (since it's not used anyway during ONLINE ALTER), but architecturally, two handlers should be supported. Avoiding the creation of lookup handler could be done here additionally, but with a cost of slowing down other more generic cases, with an additional check of online alter table active. --- .../main/alter_table_online_debug.result | 14 ++++++++++++++ mysql-test/main/alter_table_online_debug.test | 19 +++++++++++++++++++ storage/maria/ha_maria.cc | 7 +++++-- 3 files changed, 38 insertions(+), 2 deletions(-) diff --git a/mysql-test/main/alter_table_online_debug.result b/mysql-test/main/alter_table_online_debug.result index b76abdaf679..e7c875814b8 100644 --- a/mysql-test/main/alter_table_online_debug.result +++ b/mysql-test/main/alter_table_online_debug.result @@ -1176,5 +1176,19 @@ drop table t1; drop procedure p; set debug_sync=reset; # +# MDEV-30902 Server crash in LEX::first_lists_tables_same +# +create table t (id int, s date, e date, period for p(s,e), +unique(id, p without overlaps)) engine=aria; +insert into t values (1,'1971-01-01','1971-01-02'); +set debug_sync= 'alter_table_online_before_lock signal lock wait_for goon'; +alter table t force; +connection con1; +set debug_sync= 'now wait_for lock'; +delete from t; +set debug_sync= 'now signal goon'; +connection default; +drop table t; +# # End of 11.2 tests # diff --git a/mysql-test/main/alter_table_online_debug.test b/mysql-test/main/alter_table_online_debug.test index a2f0f9ca0ef..febdb388a75 100644 --- a/mysql-test/main/alter_table_online_debug.test +++ b/mysql-test/main/alter_table_online_debug.test @@ -1351,6 +1351,25 @@ drop table t1; drop procedure p; set debug_sync=reset; +--echo # +--echo # MDEV-30902 Server crash in LEX::first_lists_tables_same +--echo # +create table t (id int, s date, e date, period for p(s,e), + unique(id, p without overlaps)) engine=aria; +insert into t values (1,'1971-01-01','1971-01-02'); + +set debug_sync= 'alter_table_online_before_lock signal lock wait_for goon'; +send alter table t force; + +--connection con1 +set debug_sync= 'now wait_for lock'; +delete from t; +set debug_sync= 'now signal goon'; + +--connection default +--reap +drop table t; + --echo # --echo # End of 11.2 tests --echo # diff --git a/storage/maria/ha_maria.cc b/storage/maria/ha_maria.cc index 2f58110cb91..258f8fc8c6d 100644 --- a/storage/maria/ha_maria.cc +++ b/storage/maria/ha_maria.cc @@ -2959,8 +2959,11 @@ int ha_maria::external_lock(THD *thd, int lock_type) tons of archived logs to roll-forward, we could then not disable REDOs/UNDOs in this case. */ - DBUG_PRINT("info", ("Disabling logging for table")); - _ma_tmp_disable_logging_for_table(file, TRUE); + if (likely(file->s->now_transactional)) + { + DBUG_PRINT("info", ("Disabling logging for table")); + _ma_tmp_disable_logging_for_table(file, TRUE); + } file->autocommit= 0; } else