diff options
| author | Marko Mäkelä <marko.makela@oracle.com> | 2011-06-09 21:50:41 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@oracle.com> | 2011-06-09 21:50:41 +0300 |
| commit | c8419facb561470845c6da2a1020d558090786cd (patch) | |
| tree | e3d3290b3d7b8d80c24c4a14d2915312b1a7db2c | |
| parent | ef3c145d0e5bd191c8c4ef043bfd34d5bea4a221 (diff) | |
| download | mariadb-git-c8419facb561470845c6da2a1020d558090786cd.tar.gz | |
Disable a debug assertion that was added to track down Bug#12612184.
row_build(): The record may contain null BLOB pointers when the server
is rolling back an insert that was interrupted by a server crash.
| -rw-r--r-- | storage/innobase/row/row0row.c | 6 | ||||
| -rw-r--r-- | storage/innodb_plugin/row/row0row.c | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/storage/innobase/row/row0row.c b/storage/innobase/row/row0row.c index f30965d32bb..247f19e097c 100644 --- a/storage/innobase/row/row0row.c +++ b/storage/innobase/row/row0row.c @@ -210,7 +210,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_or_clean_all_without_sess() + 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 */ diff --git a/storage/innodb_plugin/row/row0row.c b/storage/innodb_plugin/row/row0row.c index 7260855858f..80b449a416b 100644 --- a/storage/innodb_plugin/row/row0row.c +++ b/storage/innodb_plugin/row/row0row.c @@ -231,7 +231,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 */ |