diff options
| author | Jan Lindström <jan.lindstrom@skysql.com> | 2014-12-03 13:45:21 +0200 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@skysql.com> | 2014-12-03 13:53:11 +0200 |
| commit | 24a6b413489e82971673d2a68e754fc30add3f9c (patch) | |
| tree | 8cf8f62f2f53212e0606eeb15f7c0bf6142c666b /storage | |
| parent | 316d8c7fc8ab8c33ffddc898667f409bc86c7d5a (diff) | |
| download | mariadb-git-24a6b413489e82971673d2a68e754fc30add3f9c.tar.gz | |
Move page initialization to better place.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/fil/fil0pagecompress.cc | 10 | ||||
| -rw-r--r-- | storage/xtradb/fil/fil0pagecompress.cc | 10 |
2 files changed, 0 insertions, 20 deletions
diff --git a/storage/innobase/fil/fil0pagecompress.cc b/storage/innobase/fil/fil0pagecompress.cc index 635e9c88fad..c74740ac9e1 100644 --- a/storage/innobase/fil/fil0pagecompress.cc +++ b/storage/innobase/fil/fil0pagecompress.cc @@ -461,9 +461,6 @@ fil_compress_page( ut_a(block_size > 0); #endif write_size = (size_t)ut_uint64_align_up((ib_uint64_t)write_size, block_size); - /* Initialize rest of the written data to avoid - uninitialized bytes */ - memset(out_buf+tmp, 0, write_size-tmp); #ifdef UNIV_DEBUG ut_a(write_size > 0 && ((write_size % block_size) == 0)); ut_a(write_size >= tmp); @@ -480,13 +477,6 @@ fil_compress_page( srv_stats.page_compression_saved.add((len - write_size)); srv_stats.pages_page_compressed.inc(); - if (!srv_use_trim) { - /* If persistent trims are not used we always write full - page and end of the page needs to be initialized.*/ - memset(out_buf+write_size, 0, len-write_size); - write_size = len; - } - *out_len = write_size; return(out_buf); diff --git a/storage/xtradb/fil/fil0pagecompress.cc b/storage/xtradb/fil/fil0pagecompress.cc index 0b622bac8ba..b1d5412b9f1 100644 --- a/storage/xtradb/fil/fil0pagecompress.cc +++ b/storage/xtradb/fil/fil0pagecompress.cc @@ -458,9 +458,6 @@ fil_compress_page( ut_a(block_size > 0); #endif write_size = (size_t)ut_uint64_align_up((ib_uint64_t)write_size, block_size); - /* Initialize rest of the written data to avoid - uninitialized bytes */ - memset(out_buf+tmp, 0, write_size-tmp); #ifdef UNIV_DEBUG ut_a(write_size > 0 && ((write_size % block_size) == 0)); ut_a(write_size >= tmp); @@ -477,13 +474,6 @@ fil_compress_page( srv_stats.page_compression_saved.add((len - write_size)); srv_stats.pages_page_compressed.inc(); - if (!srv_use_trim) { - /* If persistent trims are not used we always write full - page and end of the page needs to be initialized.*/ - memset(out_buf+write_size, 0, len-write_size); - write_size = len; - } - *out_len = write_size; return(out_buf); |