diff options
| author | Marko Mäkelä <marko.makela@oracle.com> | 2010-05-04 16:13:58 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@oracle.com> | 2010-05-04 16:13:58 +0300 |
| commit | 304daa74319017eb5e8653cc97c9b8829de8c7c6 (patch) | |
| tree | aa8402afb99e51ef4977fb9dfad8b32cee274d3f | |
| parent | 54b01fbff1906543e7794d6a335e6665511f48c4 (diff) | |
| download | mariadb-git-304daa74319017eb5e8653cc97c9b8829de8c7c6.tar.gz | |
fsp_init_file_page_low(): Zero out the page. (Bug #53306)
| -rw-r--r-- | mysql-test/suite/innodb/t/disabled.def | 1 | ||||
| -rw-r--r-- | storage/innobase/fsp/fsp0fsp.c | 7 | ||||
| -rw-r--r-- | storage/innobase/include/univ.i | 5 |
3 files changed, 1 insertions, 12 deletions
diff --git a/mysql-test/suite/innodb/t/disabled.def b/mysql-test/suite/innodb/t/disabled.def index dff86f24787..888298bbb09 100644 --- a/mysql-test/suite/innodb/t/disabled.def +++ b/mysql-test/suite/innodb/t/disabled.def @@ -9,4 +9,3 @@ # Do not use any TAB characters for whitespace. # ############################################################################## -innodb : Bug#53306 2010-04-30 VasilDimov valgrind warnings diff --git a/storage/innobase/fsp/fsp0fsp.c b/storage/innobase/fsp/fsp0fsp.c index e1074933fe8..1ec1c262a52 100644 --- a/storage/innobase/fsp/fsp0fsp.c +++ b/storage/innobase/fsp/fsp0fsp.c @@ -802,12 +802,7 @@ fsp_init_file_page_low( buf_block_align(page)->check_index_page_at_flush = FALSE; -#ifdef UNIV_BASIC_LOG_DEBUG - memset(page, 0xff, UNIV_PAGE_SIZE); -#endif - mach_write_to_8(page + UNIV_PAGE_SIZE - FIL_PAGE_END_LSN_OLD_CHKSUM, - ut_dulint_zero); - mach_write_to_8(page + FIL_PAGE_LSN, ut_dulint_zero); + memset(page, 0, UNIV_PAGE_SIZE); } /*************************************************************** diff --git a/storage/innobase/include/univ.i b/storage/innobase/include/univ.i index ee3a0b27b20..ecf754762ad 100644 --- a/storage/innobase/include/univ.i +++ b/storage/innobase/include/univ.i @@ -126,11 +126,6 @@ by one. */ /* the above option prevents forcing of log to disk at a buffer page write: it should be tested with this option off; also some ibuf tests are suppressed */ -/* -#define UNIV_BASIC_LOG_DEBUG -*/ - /* the above option enables basic recovery debugging: - new allocated file pages are reset */ #if (!defined(UNIV_DEBUG) && !defined(INSIDE_HA_INNOBASE_CC) && !defined(UNIV_MUST_NOT_INLINE)) /* Definition for inline version */ |