bzr push into mysql-5.1-innodb branch (marko.makela:3440 to 3443) Bug#53306

[marko.makela]

 3443 Marko Mäkelä	2010-05-04
      Document Bug #53306 in the InnoDB Plugin ChangeLog.

    modified:
      storage/innodb_plugin/ChangeLog
 3442 Marko Mäkelä	2010-05-04
      fsp_init_file_page_low(): Zero out the page. (Bug #53306)

    modified:
      mysql-test/suite/innodb/t/disabled.def
      storage/innobase/fsp/fsp0fsp.c
      storage/innobase/include/univ.i
 3441 Marko Mäkelä	2010-05-04
      fsp_init_file_page_low(): Zero out the page. (Bug #53306)

    modified:
      storage/innodb_plugin/fsp/fsp0fsp.c
 3440 Marko Mäkelä	2010-05-04
      Add Valgrind checks to catch uninitialized writes to data files.
      buf_flush_insert_into_flush_list(),
      buf_flush_insert_sorted_into_flush_list(),
      buf_flush_post_to_doublewrite_buf(): Check that the page is initialized.

    modified:
      storage/innobase/buf/buf0flu.c
=== modified file 'mysql-test/suite/innodb/t/disabled.def'
--- a/mysql-test/suite/innodb/t/disabled.def	2010-04-30 10:02:36 +0000
+++ b/mysql-test/suite/innodb/t/disabled.def	2010-05-04 13:13:58 +0000
@@ -9,4 +9,3 @@
 #  Do not use any TAB characters for whitespace.
 #
 ##############################################################################
-innodb : Bug#53306 2010-04-30 VasilDimov valgrind warnings

=== modified file 'storage/innobase/fsp/fsp0fsp.c'
--- a/storage/innobase/fsp/fsp0fsp.c	2007-06-26 13:08:11 +0000
+++ b/storage/innobase/fsp/fsp0fsp.c	2010-05-04 13:13:58 +0000
@@ -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);
 }
 
 /***************************************************************

=== modified file 'storage/innobase/include/univ.i'
--- a/storage/innobase/include/univ.i	2010-04-28 06:33:25 +0000
+++ b/storage/innobase/include/univ.i	2010-05-04 13:13:58 +0000
@@ -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 */

=== modified file 'storage/innodb_plugin/ChangeLog'
--- a/storage/innodb_plugin/ChangeLog	2010-05-04 10:55:46 +0000
+++ b/storage/innodb_plugin/ChangeLog	2010-05-04 13:15:17 +0000
@@ -1,3 +1,8 @@
[phone]	The InnoDB Team
+
+	* fsp/fsp0fsp.c:
+	Fix Bug#53306 valgrind: warnings in innodb.innodb
+
 2010-05-03	The InnoDB Team
 
 	* buf0buf.c:

=== modified file 'storage/innodb_plugin/fsp/fsp0fsp.c'
--- a/storage/innodb_plugin/fsp/fsp0fsp.c	2010-02-20 16:45:41 +0000
+++ b/storage/innodb_plugin/fsp/fsp0fsp.c	2010-05-04 13:09:17 +0000
@@ -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

Attachment: [text/bzr-bundle] bzr/[e-mail]