Skip to content

Commit

Permalink
Cleanup: Remove fil_names_write_bogus
Browse files Browse the repository at this point in the history
Ever since commit 685d958
some Perl code in the test mariabackup.huge_lsn is writing names of
non-existing files to the InnoDB redo log and testing the recovery.
We do not need any debug instrumentation to duplicate that test.
  • Loading branch information
dr-m committed Apr 22, 2022
1 parent b884410 commit 6948abb
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 93 deletions.
10 changes: 0 additions & 10 deletions mysql-test/suite/innodb/r/innodb-index,debug.rdiff

This file was deleted.

18 changes: 0 additions & 18 deletions mysql-test/suite/innodb/r/log_file_name_debug.result

This file was deleted.

11 changes: 0 additions & 11 deletions mysql-test/suite/innodb/t/innodb-index.test
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
-- source include/have_innodb.inc
# Embedded server tests do not support restarting.
-- source include/not_embedded.inc
-- source include/maybe_debug.inc

let $MYSQLD_DATADIR= `select @@datadir`;

Expand Down Expand Up @@ -1126,9 +1125,6 @@ drop table t1;
--echo #

--source include/no_checkpoint_start.inc
if ($have_debug) {
SET GLOBAL DEBUG_DBUG='+d,fil_names_write_bogus';
}
CREATE TABLE t1(f1 INT PRIMARY KEY)ENGINE=InnoDB;

CREATE TABLE t2(f1 INT PRIMARY KEY)ENGINE=InnoDB;
Expand Down Expand Up @@ -1156,13 +1152,6 @@ AND support IN ('YES', 'DEFAULT', 'ENABLED');
--move_file $MYSQLD_DATADIR/test/t0.ibd $MYSQLD_DATADIR/test/t1.ibd

--source include/start_mysqld.inc
if ($have_debug) {
# Initiate shutdown in order to issue a redo log checkpoint and to discard
# the redo log record that was emitted due to '+d,fil_names_write_bogus'.
--let $restart_noprint=2
--source include/restart_mysqld.inc
--let $restart_noprint=0
}

SELECT * FROM t1;
SELECT * FROM t2;
Expand Down
50 changes: 0 additions & 50 deletions mysql-test/suite/innodb/t/log_file_name_debug.test

This file was deleted.

4 changes: 0 additions & 4 deletions storage/innobase/fil/fil0fil.cc
Original file line number Diff line number Diff line change
Expand Up @@ -3077,10 +3077,6 @@ ATTRIBUTE_NOINLINE ATTRIBUTE_COLD void mtr_t::name_write()
fil_name_write(m_user_space->id,
UT_LIST_GET_FIRST(m_user_space->chain)->name,
&mtr);

DBUG_EXECUTE_IF("fil_names_write_bogus",
{fil_name_write(SRV_SPACE_ID_UPPER_BOUND,
"./test/bogus file.ibd", &mtr);});
mtr.commit_files();
}

Expand Down

0 comments on commit 6948abb

Please sign in to comment.