bzr push into mysql-trunk-innodb branch (marko.makela:3460 to 3461)

[marko.makela]

 3461 Marko Mäkelä	2011-01-26 [merge]
      Merge mysql-5.5-innodb to mysql-trunk-innodb.

    modified:
      storage/innobase/row/row0upd.c
 3460 Sunny Bains	2011-01-26 [merge]
      Merge from mysql-5.5-innodb to mysql-trunk-innodb.

    modified:
      storage/innobase/sync/sync0sync.c
=== modified file 'storage/innobase/row/row0upd.c'
--- a/storage/innobase/row/row0upd.c	revid:[e-mail]-20110125224940-ou7e1rruc2se7jpl
+++ b/storage/innobase/row/row0upd.c	revid:marko.makela@stripped0126081028-v3rublf9e9dtedm0
@@ -1250,6 +1250,10 @@ row_upd_changes_ord_field_binary(
 		    || dfield_is_null(dfield)) {
 			/* do nothing special */
 		} else if (UNIV_LIKELY_NULL(ext)) {
+			/* Silence a compiler warning without
+			silencing a Valgrind error. */
+			dfield_len = 0;
+			UNIV_MEM_INVALID(&dfield_len, sizeof dfield_len);
 			/* See if the column is stored externally. */
 			buf = row_ext_lookup(ext, col_no, &dfield_len);
 

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