bzr commit into mysql-5.1-innodb branch (marko.makela:3664) Bug#58623

[marko.makela]

#At file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ based on revid:kevin.lewis@strippedfh9pnd6pbc3

 3664 Marko Mäkelä	2010-12-01
      Bug#58623: Bogus debug assertion failure in i_s_locks_row_validate()
      
      This bogus assertion was introduced in the fix of Bug #57802:
      Empty ASSERTION parameter passed to the HASH_SEARCH macro.

    modified:
      storage/innodb_plugin/trx/trx0i_s.c
=== modified file 'storage/innodb_plugin/trx/trx0i_s.c'
--- a/storage/innodb_plugin/trx/trx0i_s.c	revid:kevin.lewis@stripped55-kzjegfh9pnd6pbc3
+++ b/storage/innodb_plugin/trx/trx0i_s.c	revid:marko.makela@strippediars3nt1i
@@ -435,7 +435,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]