List:Commits« Previous MessageNext Message »
From:marko.makela Date:November 2 2010 7:41am
Subject:bzr commit into mysql-next-mr-innodb branch (marko.makela:3289)
View as plain text  
#At file:///home/marko/innobase/dev/mysql2a/mysql-next-mr-innodb/ based on revid:vasil.dimov@stripped0514-udi2i9i6xmfuixah

 3289 Marko Mäkelä	2010-11-02 [merge]
      Merge mysql-trunk-innodb to mysql-next-mr-innodb.

    modified:
      storage/innobase/row/row0sel.c
=== modified file 'storage/innobase/row/row0sel.c'
--- a/storage/innobase/row/row0sel.c	revid:vasil.dimov@strippedom-20101101100514-udi2i9i6xmfuixah
+++ b/storage/innobase/row/row0sel.c	revid:marko.makela@stripped24-bu1zvivc8ai11bt4
@@ -106,6 +106,18 @@ row_sel_sec_rec_is_for_blob(
 	ulint	len;
 	byte	buf[DICT_MAX_INDEX_COL_LEN];
 
+	ut_a(clust_len >= BTR_EXTERN_FIELD_REF_SIZE);
+
+	if (UNIV_UNLIKELY
+	    (!memcmp(clust_field + clust_len - BTR_EXTERN_FIELD_REF_SIZE,
+		     field_ref_zero, BTR_EXTERN_FIELD_REF_SIZE))) {
+		/* The externally stored field was not written yet.
+		This record should only be seen by
+		recv_recovery_rollback_active() or any
+		TRX_ISO_READ_UNCOMMITTED transactions. */
+		return(FALSE);
+	}
+
 	len = btr_copy_externally_stored_field_prefix(buf, sizeof buf,
 						      zip_size,
 						      clust_field, clust_len);

Attachment: [text/bzr-bundle] bzr/marko.makela@oracle.com-20101102074124-bu1zvivc8ai11bt4.bundle
Thread
bzr commit into mysql-next-mr-innodb branch (marko.makela:3289) marko.makela2 Nov