List:Commits« Previous MessageNext Message »
From:marko.makela Date:June 9 2011 7:15pm
Subject:bzr push into mysql-trunk branch (marko.makela:3177 to 3178)
View as plain text  
 3178 Marko Mäkelä	2011-06-09 [merge]
      Merge mysql-5.5 to mysql-trunk.

    modified:
      storage/innobase/row/row0row.c
 3177 Dmitry Shulga	2011-06-10 [merge]
      Auto-merge of patch and follow-up for bug#11764334 from mysql-5.5 tree.

    modified:
      mysql-test/r/events_bugs.result
      mysql-test/t/events_bugs.test
      sql/event_db_repository.cc
      sql/event_parse_data.cc
      sql/event_parse_data.h
      sql/sql_yacc.yy
=== modified file 'storage/innobase/row/row0row.c'
--- a/storage/innobase/row/row0row.c	revid:dmitry.shulga@stripped0110609181822-31azhx0e1qg3msyn
+++ b/storage/innobase/row/row0row.c	revid:marko.makela@strippedli2imqg5vjori3m
@@ -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/marko.makela@oracle.com-20110609191337-tli2imqg5vjori3m.bundle
Thread
bzr push into mysql-trunk branch (marko.makela:3177 to 3178) marko.makela9 Jun