Skip to content

Commit 2c2d48c

Browse files
committed
Bug #29820184 REDO LOGS MAY SILENTLY BE IGNORED WHEN ENCRYPTED TABLE CANNOT
BE DECRYPTED. Post push fix. Allow the test case to be skipped conditionally. Reviewed-by: Kuba Lopuszanski <[email protected]>
1 parent 035c3c7 commit 2c2d48c

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

mysql-test/include/excludenoskip.list

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -251,3 +251,8 @@ redo_log_archive_05.test
251251

252252
# 23.0 Tests that do/don't need clone plugin.
253253
have_clone_plugin.inc
254+
255+
# The file $MYSQLTEST_VARDIR/log/no_checkpoint_cleanup.inc file is generated by
256+
# mysql-test/include/no_checkpoint_end.inc file. It can contain the skip command.
257+
# Check the test case innodb.missing_redologs for an example.
258+
no_checkpoint_cleanup.inc

mysql-test/include/no_checkpoint_end.inc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ close(LOG);
1919
my $cp1 = $cp1hi << 32 | $cp1lo;
2020
my $cp2 = $cp2hi << 32 | $cp2lo;
2121

22-
open(OUT, ">$ENV{MYSQLTEST_VARDIR}/log/check.txt") || die;
22+
open(OUT, ">$ENV{MYSQLTEST_VARDIR}/log/no_checkpoint_cleanup.inc") || die;
2323

2424
if ($cp1 > $cp || $cp2 > $cp) {
2525
print OUT "--source include/start_mysqld.inc\n";
@@ -32,5 +32,5 @@ if ($cp1 > $cp || $cp2 > $cp) {
3232
close(OUT);
3333
EOF
3434

35-
--source $MYSQLTEST_VARDIR/log/check.txt
36-
--remove_file $MYSQLTEST_VARDIR/log/check.txt
35+
--source $MYSQLTEST_VARDIR/log/no_checkpoint_cleanup.inc
36+
--remove_file $MYSQLTEST_VARDIR/log/no_checkpoint_cleanup.inc

0 commit comments

Comments
 (0)