mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 03:51:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

branches/zip: buf_page_get_gen(): Check the return status of

Browse source 
buf_zip_decompress() and return NULL on decompression failure.
This commit is contained in:
marko 2007-12-10 12:54:53 +00:00
parent 82db8fd9da
commit 40dce922cc
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
buf/buf0buf.c
View file

@ -1712,7 +1712,6 @@ buf_page_get_gen(
buf_block_t* block;
ibool accessed;
ulint fix_type;
ibool success;
ibool must_read;
ut_ad(mtr);
@ -1788,6 +1787,7 @@ loop2:
switch (buf_block_get_state(block)) {
buf_page_t* bpage;
ibool success;
case BUF_BLOCK_FILE_PAGE:
break;
@ -1904,9 +1904,12 @@ wait_until_unfixed:
/* Decompress the page and apply buffered operations
while not holding buf_pool->mutex or block->mutex. */
buf_zip_decompress(block, srv_use_checksums);
ibuf_merge_or_delete_for_page(block, space, offset,
zip_size, TRUE);
success = buf_zip_decompress(block, srv_use_checksums);
if (UNIV_LIKELY(success)) {
ibuf_merge_or_delete_for_page(block, space, offset,
zip_size, TRUE);
}
/* Unfix and unlatch the block. */
mutex_enter(&buf_pool->mutex);
@ -1917,6 +1920,12 @@ wait_until_unfixed:
mutex_exit(&block->mutex);
rw_lock_x_unlock(&block->lock);
if (UNIV_UNLIKELY(!success)) {
mutex_exit(&buf_pool->mutex);
return(NULL);
}
break;
case BUF_BLOCK_ZIP_FREE:
@ -1957,6 +1966,8 @@ wait_until_unfixed:
#endif /* UNIV_DEBUG || UNIV_BUF_DEBUG */
if (mode == BUF_GET_NOWAIT) {
ibool success;
if (rw_latch == RW_S_LATCH) {
success = rw_lock_s_lock_func_nowait(&(block->lock),
file, line);