diff options
| author | Marko Mäkelä <marko.makela@oracle.com> | 2011-02-02 14:10:12 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@oracle.com> | 2011-02-02 14:10:12 +0200 |
| commit | f2eacde4cd905303ff906d9e33308b8ba03c17f7 (patch) | |
| tree | 03c96925fa27e5937394260912a6b7a84809b5c7 | |
| parent | 1f796c2b646824aeac2927599ba3e51594cd3534 (diff) | |
| download | mariadb-git-f2eacde4cd905303ff906d9e33308b8ba03c17f7.tar.gz | |
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
| -rw-r--r-- | storage/innodb_plugin/btr/btr0cur.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/storage/innodb_plugin/btr/btr0cur.c b/storage/innodb_plugin/btr/btr0cur.c index 143135ef24c..46cd4a81ec5 100644 --- a/storage/innodb_plugin/btr/btr0cur.c +++ b/storage/innodb_plugin/btr/btr0cur.c @@ -4169,6 +4169,7 @@ btr_check_blob_fil_page_type( if (UNIV_UNLIKELY(type != FIL_PAGE_TYPE_BLOB)) { ulint flags = fil_space_get_flags(space_id); +#ifndef UNIV_DEBUG /* Improve debug test coverage */ if (UNIV_LIKELY ((flags & DICT_TF_FORMAT_MASK) == DICT_TF_FORMAT_51)) { /* 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.*/ return; } +#endif /* !UNIV_DEBUG */ ut_print_timestamp(stderr); fprintf(stderr, |