summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@oracle.com>2011-06-09 21:50:41 +0300
committerMarko Mäkelä <marko.makela@oracle.com>2011-06-09 21:50:41 +0300
commit4412b5dab64be1c1c69ec6f5941809189545787b (patch)
treee3d3290b3d7b8d80c24c4a14d2915312b1a7db2c /storage
parent53e4a8520493a33916c7c8079dcc4c09898ee4e4 (diff)
downloadmariadb-git-4412b5dab64be1c1c69ec6f5941809189545787b.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.
Diffstat (limited to 'storage')
-rw-r--r--storage/innobase/row/row0row.c6
-rw-r--r--storage/innodb_plugin/row/row0row.c6
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 */