bzr push into mysql-5.5-innodb branch (marko.makela:3246 to 3247)

[marko.makela]

 3247 Marko Mäkelä	2010-12-01 [merge]
      Merge mysql-5.1-innodb to mysql-5.5-innodb.

    modified:
      storage/innobase/trx/trx0i_s.c
 3246 kevin.lewis@stripped	2010-11-30
      Fix compiler warning for Bug#55222 patch.

    modified:
      storage/innobase/dict/dict0mem.c
=== modified file 'storage/innobase/trx/trx0i_s.c'
--- a/storage/innobase/trx/trx0i_s.c	revid:kevin.lewis@strippedm-20101201021302-311a56085wxess3x
+++ b/storage/innobase/trx/trx0i_s.c	revid:marko.makela@stripped2-xj3t62isqq5lw47j
@@ -442,7 +442,7 @@ i_s_locks_row_validate(
 		/* record lock */
 		ut_ad(!strcmp("RECORD", row->lock_type));
 		ut_ad(row->lock_index != NULL);
-		ut_ad(row->lock_data != NULL);
+		/* row->lock_data == NULL if buf_page_try_get() == NULL */
 		ut_ad(row->lock_page != ULINT_UNDEFINED);
 		ut_ad(row->lock_rec != ULINT_UNDEFINED);
 	}

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