bzr push into mysql-5.5-innodb branch (marko.makela:3292 to 3293)

[marko.makela]

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

    modified:
      storage/innobase/row/row0upd.c
 3292 Sunny Bains	2011-01-26
      In sync_close() fix a bug introduced by the fix for Bug #59683 where we iterate
      over the mutex list and free each mutex. When UNIV_MEM_DEBUG is defined, we
      need skip the hash mutex.
      
      It is a minor bug affecting only UNIV_SYNC_DEBUG builds, found by Michael.

    modified:
      storage/innobase/sync/sync0sync.c
=== modified file 'storage/innobase/row/row0upd.c'
--- a/storage/innobase/row/row0upd.c	revid:[e-mail]-20110125223359-bc6tfhyoox0rm931
+++ b/storage/innobase/row/row0upd.c	revid:marko.makela@stripped252-vlp173hj98x1orek
@@ -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]