diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-07-26 14:51:19 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-07-26 14:51:19 +0300 |
| commit | bdae5508b87b757a89b7c55ab2de4a81104a89fc (patch) | |
| tree | 2ffbb2f6b5b7a7192a58642e7cdc0948641bc0b1 | |
| parent | 42b9daaea7ece6155558f7c3bf638e8e175a7ff7 (diff) | |
| download | mariadb-git-bdae5508b87b757a89b7c55ab2de4a81104a89fc.tar.gz | |
Cleanup: Remove a test hack
Merge commit 2b6f8044903dc974c32e071bc6a7c4099481ae80 introduced
the debug injection point dict_sys_mutex_avoid to make the test
innodb.instant_alter_crash work even after the MDEV-23991 fix
(commit afc9d00c66db946c8240fe1fa6b345a3a8b6fec1).
Thanks to DDL being atomic and crash-safe in MariaDB 10.6
(mainly thanks to commit 7762ee5dbec5c336628c06bbe950837257276e57)
we do not actually need this hack anymore.
| -rw-r--r-- | mysql-test/suite/innodb/r/instant_alter_crash.result | 3 | ||||
| -rw-r--r-- | mysql-test/suite/innodb/t/instant_alter_crash.test | 3 | ||||
| -rw-r--r-- | storage/innobase/handler/ha_innodb.cc | 2 |
3 files changed, 0 insertions, 8 deletions
diff --git a/mysql-test/suite/innodb/r/instant_alter_crash.result b/mysql-test/suite/innodb/r/instant_alter_crash.result index a2c388fa103..556e8d415f4 100644 --- a/mysql-test/suite/innodb/r/instant_alter_crash.result +++ b/mysql-test/suite/innodb/r/instant_alter_crash.result @@ -40,7 +40,6 @@ ALTER TABLE t2 DROP COLUMN c3, ADD COLUMN c5 TEXT DEFAULT 'naturam abhorrere'; connection default; SET DEBUG_SYNC='now WAIT_FOR ddl'; SET GLOBAL innodb_flush_log_at_trx_commit=1; -SET debug_dbug='+d,dict_sys_mutex_avoid'; UPDATE t1 SET c2=c2+1; # Kill the server disconnect ddl; @@ -69,7 +68,6 @@ ALTER TABLE t2 ADD COLUMN (c4 TEXT NOT NULL DEFAULT ' et malorum'); connection default; SET DEBUG_SYNC='now WAIT_FOR ddl'; SET GLOBAL innodb_flush_log_at_trx_commit=1; -SET debug_dbug='+d,dict_sys_mutex_avoid'; DELETE FROM t1; # Kill the server disconnect ddl; @@ -149,7 +147,6 @@ ALTER TABLE t3 ADD COLUMN c3 TEXT NOT NULL DEFAULT 'sic transit gloria mundi'; connection default; SET DEBUG_SYNC='now WAIT_FOR ddl'; SET GLOBAL innodb_flush_log_at_trx_commit=1; -SET debug_dbug='+d,dict_sys_mutex_avoid'; INSERT INTO t1 VALUES(0,0); # Kill the server disconnect ddl; diff --git a/mysql-test/suite/innodb/t/instant_alter_crash.test b/mysql-test/suite/innodb/t/instant_alter_crash.test index 2a596342530..ddeaa6885e6 100644 --- a/mysql-test/suite/innodb/t/instant_alter_crash.test +++ b/mysql-test/suite/innodb/t/instant_alter_crash.test @@ -55,7 +55,6 @@ ALTER TABLE t2 DROP COLUMN c3, ADD COLUMN c5 TEXT DEFAULT 'naturam abhorrere'; connection default; SET DEBUG_SYNC='now WAIT_FOR ddl'; SET GLOBAL innodb_flush_log_at_trx_commit=1; -SET debug_dbug='+d,dict_sys_mutex_avoid'; UPDATE t1 SET c2=c2+1; --source include/kill_mysqld.inc @@ -84,7 +83,6 @@ ALTER TABLE t2 ADD COLUMN (c4 TEXT NOT NULL DEFAULT ' et malorum'); connection default; SET DEBUG_SYNC='now WAIT_FOR ddl'; SET GLOBAL innodb_flush_log_at_trx_commit=1; -SET debug_dbug='+d,dict_sys_mutex_avoid'; DELETE FROM t1; --source include/kill_mysqld.inc @@ -191,7 +189,6 @@ ALTER TABLE t3 ADD COLUMN c3 TEXT NOT NULL DEFAULT 'sic transit gloria mundi'; connection default; SET DEBUG_SYNC='now WAIT_FOR ddl'; SET GLOBAL innodb_flush_log_at_trx_commit=1; -SET debug_dbug='+d,dict_sys_mutex_avoid'; INSERT INTO t1 VALUES(0,0); --source include/kill_mysqld.inc diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index 65dc7fcae1a..64c3c176369 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -14374,8 +14374,6 @@ ha_innobase::info_low( stats.update_time = (ulong) ib_table->update_time; } - DBUG_EXECUTE_IF("dict_sys_mutex_avoid", goto func_exit;); - dict_stats_init(ib_table); if (flag & HA_STATUS_VARIABLE) { |