diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-04-22 12:22:28 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-04-22 12:22:28 +0300 |
commit | 6948abb94c6739101320d12ddec1d2daae929cc2 (patch) | |
tree | a378726540b539b0c9c6a060eb0f012a491cff66 /mysql-test | |
parent | b884410a0e06aa466f42f29057d68b597796dce2 (diff) | |
download | mariadb-git-6948abb94c6739101320d12ddec1d2daae929cc2.tar.gz |
Cleanup: Remove fil_names_write_bogus
Ever since commit 685d958e38b825ad9829be311f26729cccf37c46
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.
Diffstat (limited to 'mysql-test')
-rw-r--r-- | mysql-test/suite/innodb/r/innodb-index,debug.rdiff | 10 | ||||
-rw-r--r-- | mysql-test/suite/innodb/r/log_file_name_debug.result | 18 | ||||
-rw-r--r-- | mysql-test/suite/innodb/t/innodb-index.test | 11 | ||||
-rw-r--r-- | mysql-test/suite/innodb/t/log_file_name_debug.test | 50 |
4 files changed, 0 insertions, 89 deletions
diff --git a/mysql-test/suite/innodb/r/innodb-index,debug.rdiff b/mysql-test/suite/innodb/r/innodb-index,debug.rdiff deleted file mode 100644 index 2740e440cd5..00000000000 --- a/mysql-test/suite/innodb/r/innodb-index,debug.rdiff +++ /dev/null @@ -1,10 +0,0 @@ ---- innodb-index.result -+++ innodb-index.reject -@@ -1851,6 +1851,7 @@ - # - # MDEV-15325 Incomplete validation of missing tablespace during recovery - # -+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; - # Kill the server diff --git a/mysql-test/suite/innodb/r/log_file_name_debug.result b/mysql-test/suite/innodb/r/log_file_name_debug.result deleted file mode 100644 index 0058a305185..00000000000 --- a/mysql-test/suite/innodb/r/log_file_name_debug.result +++ /dev/null @@ -1,18 +0,0 @@ -# -# Bug#19685095 DO NOT CARE ABOUT UNRESOLVED MLOG_FILE_NAME -# IF THERE ARE NO OPERATIONS TO APPLY -# -SET GLOBAL DEBUG_DBUG='+d,fil_names_write_bogus'; -CREATE TABLE t1(a INT PRIMARY KEY) ENGINE=InnoDB; -# Kill the server -# restart: --debug=d,innodb_log_abort_1 --innodb-log-file-size=4194304 -SELECT * FROM t1; -ERROR 42000: Unknown storage engine 'InnoDB' -FOUND 1 /InnoDB: Tablespace 4294967280 was not found at .*, but there were no modifications either/ in mysqld.1.err -# restart: --debug=d,innodb_log_abort_5,ib_log --innodb-log-file-size=4194304 -SELECT * FROM t1; -ERROR 42000: Unknown storage engine 'InnoDB' -FOUND 1 /ib_log: FILE_CHECKPOINT.* written/ in mysqld.1.err -# restart -# restart -DROP TABLE t1; diff --git a/mysql-test/suite/innodb/t/innodb-index.test b/mysql-test/suite/innodb/t/innodb-index.test index 03cbb5aef9d..c80e3e6c066 100644 --- a/mysql-test/suite/innodb/t/innodb-index.test +++ b/mysql-test/suite/innodb/t/innodb-index.test @@ -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`; @@ -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; @@ -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; diff --git a/mysql-test/suite/innodb/t/log_file_name_debug.test b/mysql-test/suite/innodb/t/log_file_name_debug.test deleted file mode 100644 index 9ef3c9ff4dc..00000000000 --- a/mysql-test/suite/innodb/t/log_file_name_debug.test +++ /dev/null @@ -1,50 +0,0 @@ ---source include/have_innodb.inc -# Embedded server does not support restarting ---source include/not_embedded.inc ---source include/have_debug.inc - ---echo # ---echo # Bug#19685095 DO NOT CARE ABOUT UNRESOLVED MLOG_FILE_NAME ---echo # IF THERE ARE NO OPERATIONS TO APPLY ---echo # - -SET GLOBAL DEBUG_DBUG='+d,fil_names_write_bogus'; ---disable_query_log -call mtr.add_suppression("InnoDB: Plugin initialization aborted"); -call mtr.add_suppression("Plugin 'InnoDB' init function returned error"); -call mtr.add_suppression("Plugin 'InnoDB' registration as a STORAGE ENGINE failed"); -FLUSH TABLES; ---enable_query_log - ---let $change=`SELECT if(@@innodb_log_file_size = 4194304, 8388608, 4194304)` ---let $resize= --innodb-log-file-size=$change - ---source include/no_checkpoint_start.inc - -CREATE TABLE t1(a INT PRIMARY KEY) ENGINE=InnoDB; - ---let CLEANUP_IF_CHECKPOINT=DROP TABLE t1; ---source include/no_checkpoint_end.inc - ---let $restart_parameters= --debug=d,innodb_log_abort_1 $resize ---source include/start_mysqld.inc ---error ER_UNKNOWN_STORAGE_ENGINE -SELECT * FROM t1; - ---let SEARCH_FILE = $MYSQLTEST_VARDIR/log/mysqld.1.err ---let SEARCH_PATTERN = InnoDB: Tablespace 4294967280 was not found at .*, but there were no modifications either ---source include/search_pattern_in_file.inc - ---let $restart_parameters= --debug=d,innodb_log_abort_5,ib_log $resize ---source include/restart_mysqld.inc ---error ER_UNKNOWN_STORAGE_ENGINE -SELECT * FROM t1; ---let SEARCH_PATTERN= ib_log: FILE_CHECKPOINT.* written ---source include/search_pattern_in_file.inc - ---let $restart_parameters= ---source include/restart_mysqld.inc -# 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'. ---source include/restart_mysqld.inc -DROP TABLE t1; |