summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@oracle.com>2012-02-27 23:19:14 +0200
committerMarko Mäkelä <marko.makela@oracle.com>2012-02-27 23:19:14 +0200
commit5682272e1c28ad2197c3f06ccb0c2a55aa71d469 (patch)
treea6aae2af8f97c9b2f6607185d91d845575eb2f21 /storage
parent6a0d03fce76616dd10e8d6bd83c19af26f8c5874 (diff)
downloadmariadb-git-5682272e1c28ad2197c3f06ccb0c2a55aa71d469.tar.gz
Remove a bogus BLOB debug assertion that was added in Bug#13721257 fix.
Diffstat (limited to 'storage')
-rw-r--r--storage/innodb_plugin/row/row0row.c14
1 files changed, 5 insertions, 9 deletions
diff --git a/storage/innodb_plugin/row/row0row.c b/storage/innodb_plugin/row/row0row.c
index 7ec05f01821..c1f39fb68cb 100644
--- a/storage/innodb_plugin/row/row0row.c
+++ b/storage/innodb_plugin/row/row0row.c
@@ -245,15 +245,11 @@ row_build(
#if defined UNIV_DEBUG || defined UNIV_BLOB_LIGHT_DEBUG
if (rec_offs_any_null_extern(rec, offsets)) {
/* This condition can occur during crash recovery
- before trx_rollback_active() has completed execution.
-
- This condition is possible if the server crashed
- during an insert or update-by-delete-and-insert before
- btr_store_big_rec_extern_fields() did mtr_commit() all
- BLOB pointers to the freshly inserted clustered index
- record. */
- ut_a(trx_assert_recovered(
- row_get_rec_trx_id(rec, index, offsets)));
+ before trx_rollback_active() has completed execution,
+ or when a concurrently executing
+ row_ins_index_entry_low() has committed the B-tree
+ mini-transaction but has not yet managed to restore
+ the cursor position for writing the big_rec. */
ut_a(trx_undo_roll_ptr_is_insert(
row_get_rec_roll_ptr(rec, index, offsets)));
}