mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 05:22:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge mysql-5.1 to mysql-5.5.

Browse source
This commit is contained in:
Marko Mäkelä 2013-05-15 22:50:44 +03:00
commit d5372672da
1 changed files with 39 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
storage/innobase/page/page0zip.c
View file

@ -2148,8 +2148,19 @@ page_zip_decompress_node_ptrs(
- PAGE_ZIP_START - PAGE_DIR);
switch (inflate(d_stream, Z_SYNC_FLUSH)) {
case Z_STREAM_END:
/* Apparently, n_dense has grown
since the time the page was last compressed. */
if (d_stream->next_out
!= rec - REC_N_NEW_EXTRA_BYTES) {
/* n_dense has grown since the page
was last compressed. */
} else {
/* Skip the REC_N_NEW_EXTRA_BYTES. */
d_stream->next_out = rec;
/* Set heap_no and the status bits. */
mach_write_to_2(rec - REC_NEW_HEAP_NO,
heap_status);
heap_status += 1 << REC_HEAP_NO_SHIFT;
}
goto zlib_done;
case Z_OK:
case Z_BUF_ERROR:
@ -2337,8 +2348,19 @@ page_zip_decompress_sec(
if (UNIV_LIKELY(d_stream->avail_out)) {
switch (inflate(d_stream, Z_SYNC_FLUSH)) {
case Z_STREAM_END:
/* Apparently, n_dense has grown
since the time the page was last compressed. */
if (d_stream->next_out
!= rec - REC_N_NEW_EXTRA_BYTES) {
/* n_dense has grown since the page
was last compressed. */
} else {
/* Skip the REC_N_NEW_EXTRA_BYTES. */
d_stream->next_out = rec;
/* Set heap_no and the status bits. */
mach_write_to_2(rec - REC_NEW_HEAP_NO,
heap_status);
heap_status += 1 << REC_HEAP_NO_SHIFT;
}
goto zlib_done;
case Z_OK:
case Z_BUF_ERROR:
@ -2596,8 +2618,19 @@ page_zip_decompress_clust(
err = inflate(d_stream, Z_SYNC_FLUSH);
switch (err) {
case Z_STREAM_END:
/* Apparently, n_dense has grown
since the time the page was last compressed. */
if (d_stream->next_out
!= rec - REC_N_NEW_EXTRA_BYTES) {
/* n_dense has grown since the page
was last compressed. */
} else {
/* Skip the REC_N_NEW_EXTRA_BYTES. */
d_stream->next_out = rec;
/* Set heap_no and the status bits. */
mach_write_to_2(rec - REC_NEW_HEAP_NO,
heap_status);
heap_status += 1 << REC_HEAP_NO_SHIFT;
}
goto zlib_done;
case Z_OK:
case Z_BUF_ERROR: