Merge mysql-5.1-innodb to mysql-5.5-innodb.

b92f2d29 · Marko Mäkelä · 6d1760be · 469a8112 · b92f2d29
Commit b92f2d29 authored Dec 01, 2010 by Marko Mäkelä
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

storage/innobase/trx/trx0i_s.c storage/innobase/trx/trx0i_s.c +1 -1

No files found.
--- a/storage/innobase/trx/trx0i_s.c
+++ b/storage/innobase/trx/trx0i_s.c
@@ -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);
 	}