Skip to content
Permalink
Browse files
MDEV-15767 innodb.101_compatibility fails
The test innodb.101_compatibility occasionally fails, because the flags
for the tables tdd and tp are not always converted back. Thus, the
second attempt of corrupting the flags will update garbage to garbage,
and cause test failure.

This started failing related to one or two MDEV-12266 commits affecting
the function fsp_flags_try_adjust().

fsp_flags_try_adjust(): If the file has not been opened (space->size==0),
try determining its size by reading the file. Only if the file is not
readable, give up.

Also, avoid dummy writes in the Perl script, and add some instrumentation.
  • Loading branch information
dr-m committed Apr 4, 2018
1 parent b7ea563 commit 12ed50c
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 6 deletions.
@@ -15,10 +15,14 @@ sub convert_to_mariadb_101
$badflags |= 1<<6|$compression_level<<7 if ($flags & 1 << 16);
$badflags |= ($flags & 15 << 6) << 7; # PAGE_SSIZE

substr ($_, 54, 4) = pack("N", $badflags);
# Replace the innodb_checksum_algorithm=none checksum
substr ($_, 0, 4) = pack("N", 0xdeadbeef);
substr ($_, $page_size - 8, 4) = pack("N", 0xdeadbeef);
syswrite(FILE, $_, $page_size)==$page_size||die "Unable to write $file\n";
if ($badflags != $flags)
{
warn "$file: changing $flags to $badflags\n";
substr ($_, 54, 4) = pack("N", $badflags);
# Replace the innodb_checksum_algorithm=none checksum
substr ($_, 0, 4) = pack("N", 0xdeadbeef);
substr ($_, $page_size - 8, 4) = pack("N", 0xdeadbeef);
syswrite(FILE, $_, $page_size)==$page_size||die "Unable to write $file\n";
}
close(FILE);
}
@@ -4156,7 +4156,8 @@ void fsp_flags_try_adjust(fil_space_t* space, ulint flags)
{
ut_ad(!srv_read_only_mode);
ut_ad(fsp_flags_is_valid(flags, space->id));
if (!space->size) {
if (!space->size && (space->purpose != FIL_TYPE_TABLESPACE
|| !fil_space_get_size(space->id))) {
return;
}
/* This code is executed during server startup while no

0 comments on commit 12ed50c

Please sign in to comment.