bzr commit into mysql-trunk branch (marko.makela:3178)

[marko.makela]

#At file:///home/marko/innobase/dev/mysql2a/mysql-trunk/ based on revid:dmitry.shulga@strippedazhx0e1qg3msyn

 3178 Marko Mäkelä	2011-06-09 [merge]
      Merge mysql-5.5 to mysql-trunk.

    modified:
      storage/innobase/row/row0row.c
=== modified file 'storage/innobase/row/row0row.c'
--- a/storage/innobase/row/row0row.c	revid:dmitry.shulga@strippedx0e1qg3msyn
+++ b/storage/innobase/row/row0row.c	revid:marko.makela@stripped
@@ -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 */
 

Attachment: [text/bzr-bundle] bzr/[e-mail]