diff options
| author | Marko Mäkelä <marko.makela@oracle.com> | 2011-06-09 22:03:16 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@oracle.com> | 2011-06-09 22:03:16 +0300 |
| commit | ca84a75e44d1edd95b34ac113af7e7e78f289ab4 (patch) | |
| tree | d95f41d0178e010b671f1b95d8778b0bed78e1db | |
| parent | 4fe2cd10c2b18c8e0b9af3a5511b7dd23977c7b5 (diff) | |
| parent | 4412b5dab64be1c1c69ec6f5941809189545787b (diff) | |
| download | mariadb-git-ca84a75e44d1edd95b34ac113af7e7e78f289ab4.tar.gz | |
Merge mysql-5.1 to mysql-5.5.
| -rw-r--r-- | storage/innobase/row/row0row.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/storage/innobase/row/row0row.c b/storage/innobase/row/row0row.c index 16a327b4715..abbea1b585f 100644 --- a/storage/innobase/row/row0row.c +++ b/storage/innobase/row/row0row.c @@ -200,7 +200,11 @@ row_build( ut_ad(rec_offs_validate(rec, index, offsets)); } -#if defined UNIV_DEBUG || defined UNIV_BLOB_LIGHT_DEBUG +#if 0 /* defined UNIV_DEBUG || defined UNIV_BLOB_LIGHT_DEBUG */ + /* This one can fail in trx_rollback_active() if + the server crashed during an insert before the + btr_store_big_rec_extern_fields() did mtr_commit() + all BLOB pointers to the clustered index record. */ ut_a(!rec_offs_any_null_extern(rec, offsets)); #endif /* UNIV_DEBUG || UNIV_BLOB_LIGHT_DEBUG */ |