mirror of
https://github.com/MariaDB/server.git
synced 2025-02-17 19:05:37 +01:00
Bug #55284 diagnostics: When UNIV_DEBUG, do not tolerate garbage in
Antelope files in btr_check_blob_fil_page_type(). Unfortunately, we must keep the check in production builds, because InnoDB wrote uninitialized garbage to FIL_PAGE_TYPE until fairly recently (5.1.x). rb://546 approved by Jimmy Yang
This commit is contained in:
parent
0dfcfd112a
commit
03d42acca2
1 changed files with 2 additions and 0 deletions
|
@ -4169,6 +4169,7 @@ btr_check_blob_fil_page_type(
|
||||||
if (UNIV_UNLIKELY(type != FIL_PAGE_TYPE_BLOB)) {
|
if (UNIV_UNLIKELY(type != FIL_PAGE_TYPE_BLOB)) {
|
||||||
ulint flags = fil_space_get_flags(space_id);
|
ulint flags = fil_space_get_flags(space_id);
|
||||||
|
|
||||||
|
#ifndef UNIV_DEBUG /* Improve debug test coverage */
|
||||||
if (UNIV_LIKELY
|
if (UNIV_LIKELY
|
||||||
((flags & DICT_TF_FORMAT_MASK) == DICT_TF_FORMAT_51)) {
|
((flags & DICT_TF_FORMAT_MASK) == DICT_TF_FORMAT_51)) {
|
||||||
/* Old versions of InnoDB did not initialize
|
/* Old versions of InnoDB did not initialize
|
||||||
|
@ -4177,6 +4178,7 @@ btr_check_blob_fil_page_type(
|
||||||
a BLOB page that is in Antelope format.*/
|
a BLOB page that is in Antelope format.*/
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
#endif /* !UNIV_DEBUG */
|
||||||
|
|
||||||
ut_print_timestamp(stderr);
|
ut_print_timestamp(stderr);
|
||||||
fprintf(stderr,
|
fprintf(stderr,
|
||||||
|
|
Loading…
Add table
Reference in a new issue