bzr commit into mysql-5.5-innodb branch (marko.makela:3293)

[marko.makela]

#At file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ based on revid:sunny.bains@strippedhyoox0rm931

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

    modified:
      storage/innobase/row/row0upd.c
=== modified file 'storage/innobase/row/row0upd.c'
--- a/storage/innobase/row/row0upd.c	revid:sunny.bains@stripped9-bc6tfhyoox0rm931
+++ b/storage/innobase/row/row0upd.c	revid:marko.makela@strippedrek
@@ -1252,6 +1252,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]