bzr commit into mysql-trunk-innodb branch (marko.makela:3121)

[marko.makela]

#At file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ based on revid:marko.makela@stripped4btnkyhqm229

 3121 Marko Mäkelä	2010-06-24
      trx_undo_parse_page_header(): Silence a bogus warning.

    modified:
      storage/innobase/trx/trx0undo.c
=== modified file 'storage/innobase/trx/trx0undo.c'
--- a/storage/innobase/trx/trx0undo.c	revid:marko.makela@stripped624060929-z7dj4btnkyhqm229
+++ b/storage/innobase/trx/trx0undo.c	revid:marko.makela@strippedg2u908nifuwi
@@ -707,6 +707,12 @@ trx_undo_parse_page_header(
 	mtr_t*	mtr)	/*!< in: mtr or NULL */
 {
 	trx_id_t	trx_id;
+	/* Silence a GCC warning about possibly uninitialized variable
+	when mach_ull_parse_compressed() is not inlined. */
+	ut_d(trx_id = 0);
+	/* Declare the variable uninitialized in Valgrind, so that the
+	above initialization will not mask any bugs. */
+	UNIV_MEM_INVALID(&trx_id, sizeof trx_id);
 
 	ptr = mach_ull_parse_compressed(ptr, end_ptr, &trx_id);
 

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