Skip to content

Commit 51a1fc7

Browse files
committed
Fix a compiler warning
fil_space_verify_crypt_checksum(): Add a dummy return statement in case memory is corrupted and innodb_checksum_algorithm has an invalid value.
1 parent 8c43f96 commit 51a1fc7

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

storage/innobase/fil/fil0crypt.cc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2630,4 +2630,7 @@ bool fil_space_verify_crypt_checksum(const byte* page, ulint zip_size)
26302630
return checksum == buf_calc_page_crc32(page)
26312631
|| checksum == buf_calc_page_new_checksum(page);
26322632
}
2633+
2634+
ut_ad(!"unhandled innodb_checksum_algorithm");
2635+
return false;
26332636
}

storage/xtradb/fil/fil0crypt.cc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2630,4 +2630,7 @@ bool fil_space_verify_crypt_checksum(const byte* page, ulint zip_size)
26302630
return checksum == buf_calc_page_crc32(page)
26312631
|| checksum == buf_calc_page_new_checksum(page);
26322632
}
2633+
2634+
ut_ad(!"unhandled innodb_checksum_algorithm");
2635+
return false;
26332636
}

0 commit comments

Comments
 (0)