database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

branches/zip: page_zip_validate(): Replace buf_frame_alloc() with

Browse Source 
ut_malloc() to avoid breaking the latching order.

page_rec_check(), page_dir_slot_get_rec(): Replace buf_frame_align()
with ut_align_down() to avoid assertion failures in page_zip_validate().
This commit is contained in:
marko
2006-07-28 07:34:33 +00:00
parent a201d0c159
commit a2121234a7
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
page/page0zip.c
View File

@@ -1996,6 +1996,7 @@ page_zip_validate(
const page_t* page) /* in: uncompressed page */
{
page_zip_des_t temp_page_zip = *page_zip;
byte* temp_page_buf;
page_t* temp_page;
ibool valid;
@@ -2016,7 +2017,10 @@ page_zip_validate(
return(TRUE);
}
temp_page = buf_frame_alloc();
/* page_zip_decompress() expects the uncompressed page to be
UNIV_PAGE_SIZE aligned. */
temp_page_buf = ut_malloc(2 * UNIV_PAGE_SIZE);
temp_page = ut_align(temp_page_buf, UNIV_PAGE_SIZE);
valid = page_zip_decompress(&temp_page_zip, temp_page);
if (!valid) {
@@ -2052,7 +2056,7 @@ page_zip_validate(
}
func_exit:
buf_frame_free(temp_page);
ut_free(temp_page_buf);
return(valid);
}
#endif /* UNIV_ZIP_DEBUG */