diff options
| author | Marko Mäkelä <marko.makela@oracle.com> | 2010-12-01 10:09:32 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@oracle.com> | 2010-12-01 10:09:32 +0200 |
| commit | 2ed5c7d1d229b274f4a1452e9729a03581c6502f (patch) | |
| tree | e7df21f84f4caa0a2863d9051f299604f0b39924 /storage | |
| parent | dd143b8900f424383787ad3659326679521bf949 (diff) | |
| parent | 55a12f888ac086809f59a5268e44ee1062896933 (diff) | |
| download | mariadb-git-2ed5c7d1d229b274f4a1452e9729a03581c6502f.tar.gz | |
Merge mysql-5.1-innodb to mysql-5.5-innodb.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/trx/trx0i_s.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/innobase/trx/trx0i_s.c b/storage/innobase/trx/trx0i_s.c index 8b11e706180..cbbe286079d 100644 --- 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); } |