Skip to content

Commit 650ffcd

Browse files
committed
Extend the innodb.log_corruption test.
Remove the dependency on unzip. Instead, generate the InnoDB files with perl. log_block_checksum_is_ok(): Correct the error message. recv_scan_log_recs(): Remove the duplicated error message for log block checksum mismatch. innobase_start_or_create_for_mysql(): If the server is in read-only mode or if innodb_force_recovery>=3, do not try to modify the system tablespace. (If the doublewrite buffer or the non-core system tables do not exist, do not try to create them.) innodb_shutdown(): Relax a debug assertion. If the system tablespace did not contain a doublewrite buffer and if we started up in innodb_read_only mode or with innodb_force_recovery>=3, it will not be created. dict_create_or_check_sys_tablespace(): Set the flag srv_sys_tablespaces_open when the tables exist.
1 parent 8481c70 commit 650ffcd

16 files changed

+244
-83
lines changed

mysql-test/include/have_unzip.inc

Lines changed: 0 additions & 3 deletions
This file was deleted.

mysql-test/suite.pm

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,6 @@ sub skip_combinations {
6868
unless $::mysqld_variables{'version-ssl-library'} =~ /OpenSSL (\S+)/
6969
and $1 ge "1.0.1d";
7070

71-
$skip{'include/have_unzip.inc'} = 'no unzip executable' unless `unzip`;
72-
7371
%skip;
7472
}
7573

mysql-test/suite/innodb/r/log_corruption.result

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@
1111
# Test a corrupted MLOG_FILE_NAME record.
1212
# valid header, valid checkpoint 1, all-zero (invalid) checkpoint 2
1313
# Test a corrupted MLOG_FILE_NAME record.
14-
# valid header, invalid checkpoint 1, valid checkpoint 2
14+
# valid header, invalid checkpoint 1, valid checkpoint 2, invalid block
15+
# valid header, invalid checkpoint 1, valid checkpoint 2, invalid log record
16+
ib_buffer_pool
1517
ib_logfile0
1618
ib_logfile1
1719
ibdata1
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)