Commit c1f5f61c authored by Jan Lindström's avatar Jan Lindström

Make sure that information schema knows also page compressed page

type and that we decompress fist page if it is page compressed
before really accessing it.
parent d2491996
......@@ -2123,18 +2123,17 @@ fil_read_first_page(
do not validate the first page. */
if (!one_read_already) {
*flags = fsp_header_get_flags(page);
*space_id = fsp_header_get_space_id(page);
}
/* Page is page compressed page, need to decompress, before
continue. */
if (fsp_flags_is_page_compressed(*flags)) {
if (fil_page_is_compressed(page)) {
ulint write_size=0;
fil_decompress_page(NULL, page, UNIV_PAGE_SIZE, &write_size);
}
if (!one_read_already) {
*space_id = fsp_header_get_space_id(page);
check_msg = fil_check_first_page(page);
}
......
......@@ -92,6 +92,7 @@ static buf_page_desc_t i_s_page_type[] = {
{"COMPRESSED_BLOB", FIL_PAGE_TYPE_ZBLOB},
{"COMPRESSED_BLOB2", FIL_PAGE_TYPE_ZBLOB2},
{"IBUF_INDEX", I_S_PAGE_TYPE_IBUF},
{"PAGE COMPRESSED", FIL_PAGE_PAGE_COMPRESSED},
{"UNKNOWN", I_S_PAGE_TYPE_UNKNOWN}
};
......
......@@ -2158,18 +2158,17 @@ fil_read_first_page(
do not validate the first page. */
if (!one_read_already) {
*flags = fsp_header_get_flags(page);
*space_id = fsp_header_get_space_id(page);
}
/* Page is page compressed page, need to decompress, before
continue. */
if (fsp_flags_is_page_compressed(*flags)) {
if (fil_page_is_compressed(page)) {
ulint write_size=0;
fil_decompress_page(NULL, page, UNIV_PAGE_SIZE, &write_size);
}
if (!one_read_already) {
*space_id = fsp_header_get_space_id(page);
check_msg = fil_check_first_page(page);
}
......
......@@ -103,6 +103,7 @@ static buf_page_desc_t i_s_page_type[] = {
{"COMPRESSED_BLOB", FIL_PAGE_TYPE_ZBLOB},
{"COMPRESSED_BLOB2", FIL_PAGE_TYPE_ZBLOB2},
{"IBUF_INDEX", I_S_PAGE_TYPE_IBUF},
{"PAGE COMPRESSED", FIL_PAGE_PAGE_COMPRESSED},
{"UNKNOWN", I_S_PAGE_TYPE_UNKNOWN}
};
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment