summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorVasil Dimov <vasil.dimov@oracle.com>2010-05-04 16:57:09 +0300
committerVasil Dimov <vasil.dimov@oracle.com>2010-05-04 16:57:09 +0300
commit6327a4f0af8d2282f174c55073042a0d3483147f (patch)
tree9e181c42cea33736e4fd56fabf06df57e04a98ce /storage
parent77817e64bbc9220252e4fd57ae0339bec89d34f3 (diff)
downloadmariadb-git-6327a4f0af8d2282f174c55073042a0d3483147f.tar.gz
Merge from mysql-5.1-innodb:
------------------------------------------------------------ revno: 3441 revision-id: marko.makela@oracle.com-20100504130917-qmvzbj3pgil2nuat parent: marko.makela@oracle.com-20100504125510-gemcfhj7mefrhalo committer: Marko M?kel? <marko.makela@oracle.com> branch nick: 5.1-innodb timestamp: Tue 2010-05-04 16:09:17 +0300 message: fsp_init_file_page_low(): Zero out the page. (Bug #53306) modified: storage/innodb_plugin/fsp/fsp0fsp.c 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Ffsp%2Ffsp0fsp.c ------------------------------------------------------------
Diffstat (limited to 'storage')
-rw-r--r--storage/innobase/fsp/fsp0fsp.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/storage/innobase/fsp/fsp0fsp.c b/storage/innobase/fsp/fsp0fsp.c
index c7f1a299d8a..2bae8481d20 100644
--- a/storage/innobase/fsp/fsp0fsp.c
+++ b/storage/innobase/fsp/fsp0fsp.c
@@ -869,12 +869,10 @@ fsp_init_file_page_low(
return;
}
- UNIV_MEM_INVALID(page, UNIV_PAGE_SIZE);
+ memset(page, 0, UNIV_PAGE_SIZE);
mach_write_to_4(page + FIL_PAGE_OFFSET, buf_block_get_page_no(block));
- memset(page + FIL_PAGE_LSN, 0, 8);
mach_write_to_4(page + FIL_PAGE_ARCH_LOG_NO_OR_SPACE_ID,
buf_block_get_space(block));
- memset(page + UNIV_PAGE_SIZE - FIL_PAGE_END_LSN_OLD_CHKSUM, 0, 8);
}
#ifndef UNIV_HOTBACKUP