Commit d3d72895 authored by marko's avatar marko

branches/zip: buf_flush_write_block_low(): When flushing a compressed page

that also exists in uncompressed form in the buffer pool, pass the
compressed frame to fil_io() instead of the uncompressed one when
not using the doublewrite buffer.
parent e77a82a0
...@@ -720,8 +720,12 @@ buf_flush_write_block_low( ...@@ -720,8 +720,12 @@ buf_flush_write_block_low(
memset(frame + FIL_PAGE_FILE_FLUSH_LSN, 0, 8); memset(frame + FIL_PAGE_FILE_FLUSH_LSN, 0, 8);
break; break;
case BUF_BLOCK_FILE_PAGE: case BUF_BLOCK_FILE_PAGE:
frame = ((buf_block_t*) bpage)->frame; frame = bpage->zip.data;
buf_flush_init_for_writing(frame, if (!frame) {
frame = ((buf_block_t*) bpage)->frame;
}
buf_flush_init_for_writing(((buf_block_t*) bpage)->frame,
bpage->zip.data bpage->zip.data
? &bpage->zip : NULL, ? &bpage->zip : NULL,
bpage->newest_modification); bpage->newest_modification);
......
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