From: vasil.dimov
Date: April 22 2010 11:06am
Subject: bzr commit into mysql-trunk-innodb branch (vasil.dimov:3039)
List-Archive: http://lists.mysql.com/commits/106354
Message-Id: <20100422110624.96A672E0B3@mail.v5d.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2189924896498789937=="

--===============2189924896498789937==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///usr/local/devel/bzrroot/server/mysql-trunk-innodb/ based on revid:vasil.dimov@stripped

 3039 Vasil Dimov	2010-04-22
      Merge c3400 from mysql-5.1-innodb

    modified:
      storage/innobase/trx/trx0rec.c
=== modified file 'storage/innobase/trx/trx0rec.c'
--- a/storage/innobase/trx/trx0rec.c	2010-03-26 14:19:01 +0000
+++ b/storage/innobase/trx/trx0rec.c	2010-04-22 11:06:03 +0000
@@ -350,8 +350,13 @@ trx_undo_rec_get_col_val(
 
 		ut_ad(*orig_len >= BTR_EXTERN_FIELD_REF_SIZE);
 		ut_ad(*len > *orig_len);
-		ut_ad(*len >= REC_MAX_INDEX_COL_LEN
+		/* @see dtuple_convert_big_rec() */
+		ut_ad(*len >= BTR_EXTERN_FIELD_REF_SIZE * 2);
+		/* we do not have access to index->table here
+		ut_ad(dict_table_get_format(index->table) >= DICT_TF_FORMAT_ZIP
+		      || *len >= REC_MAX_INDEX_COL_LEN
 		      + BTR_EXTERN_FIELD_REF_SIZE);
+		*/
 
 		*len += UNIV_EXTERN_STORAGE_FIELD;
 		break;
@@ -1075,11 +1080,15 @@ trx_undo_rec_get_partial_row(
 			/* If the prefix of this column is indexed,
 			ensure that enough prefix is stored in the
 			undo log record. */
-			ut_a(ignore_prefix
-			     || !col->ord_part
-			     || dfield_get_len(dfield)
-			     >= REC_MAX_INDEX_COL_LEN
-			     + BTR_EXTERN_FIELD_REF_SIZE);
+			if (!ignore_prefix && col->ord_part) {
+				ut_a(dfield_get_len(dfield)
+				     >= 2 * BTR_EXTERN_FIELD_REF_SIZE);
+				ut_a(dict_table_get_format(index->table)
+				     >= DICT_TF_FORMAT_ZIP
+				     || dfield_get_len(dfield)
+				     >= REC_MAX_INDEX_COL_LEN
+				     + BTR_EXTERN_FIELD_REF_SIZE);
+			}
 		}
 	}
 


--===============2189924896498789937==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/vasil.dimov@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: vasil.dimov@stripped
# target_branch: file:///usr/local/devel/bzrroot/server/mysql-trunk-\
#   innodb/
# testament_sha1: fce2d5e4c82538255a7a1e9b7cfed77b7538a4ff
# timestamp: 2010-04-22 14:06:24 +0300
# source_branch: file:///usr/local/devel/bzrroot/server/mysql-trunk/
# base_revision_id: vasil.dimov@stripped\
#   0lzfjx2l5oi7nngy
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWRinD6IAAhXfgHAwc3v//38n
3VC////+UASgeAPRFQioDJFNoTTQNNTyNDUeSMJ6mjQDTQBoYjJocZMmhiMTRgEYCYQBgJpo0yNA
McZMmhiMTRgEYCYQBgJpo0yNAMJJEaj0p6GppmpPaYqNtE1PSB+qMmag0NNNGgAJJJoyaaCYmgUx
PQppskaaPSYjyQDDU9T1GiyLCBgKEEMIKIEIGR80bpb6LikXHnvSz732L07Boc0NF8IYEhgsrpAi
wxi5p2lJECBGRHt/fR7M7W38QtV0CIdWk0bWnkpjoyLMOV1u2jjKT1ZHaaUKGpBgFDIFn+1wh+Br
6wNbHFL2qEiA7rMHVhd5pOOUTSrxwJDcAClRLIGNRcEmGNBUt3RrCroaVVTLwLa5BO3QiJjbVm4Q
GGMF2uQLQGDEAkJcrgSYo/xuK9Vu3DGCGAiYRC/EJ85FSZ162jYA1rOYxyc1LGQhyDAHnQLaOEUq
oMhwpEBwwmrGoOv2pblaLe3udNBeqxeeo6HiuU4BBQe/El0kTuMjM/PtUPst9Wqwew8NDWLPx6TK
mvfoOrVNYjJBrIoLsjeRzeDg2dTdwom4icFO7hqFbNi1PvKSvXii3QKAmRKyca5TQ5BSUYdmBEzB
iZ/uFGp8SrkJrknWx5i4v3PsIhrzH22XEg3zVZgwszCUR15EpCMnmtMFZ/1l2NoYnspHGRgHkJEz
EZPccVbbdYEbloDqFkSshMVpAVbo5A+q9pheZsTJkqqxjRpRbKytST4FgUvqTzsX2ntWphe5hhV6
so6BRcz5GbaxbrNu58HEGv0szNJLYFK1iKfgGMAYpeuzxPgOO4efFN4qPeiCpPBVr5jIcSViHneq
SR4KpUHgWDjleTHrwKygvIKJBWqheKY6lWf4bYIcSVRAms1aUGRIxT1aHFGjDHMOcWJgcPd/JLfj
DxMqB5pGNQf6VFWzYIwl5jnJA58ZF5PvmS/vKI7US8mc5wxnlLt948UHHuF6QpoRRGPX5hMThiCs
7RVE5p0dB1BmDCewM4ZezFG3odvFU9hDW4iG2UGVJ7zX2lZJUj07MiKBx+auCMFxhyncqGLDKIfI
JozXbvhmyFbITc1JwOo5tpMR3WliHhd5/0HBy+iig4BAHZJkcbpy7ZQ3A+RbbgoUBMCasVMMHhl1
mlBQYhkQHh/PHgS1hso6Bl1c8secUIB9BaxVfKlcDp3m8GuuZ2pG/nWBKeswFoED4vOv6bMEiAQP
XARh6QbqNW/+Go5H02AbQOe2jzbRPTFIVipDj7qmcIiehNyA+pTCHbXjjvJi6+7hjsWRI1IwGnRO
UwckS3GTR2S8RgYqclKXxIJSM6pW5g9SlUirjZOErIZTPu1YVn2rwOZIwgbHPR3iIhnGSOZ6ontS
PK2Bw4cFzRqIhssamMRvusMd+xTCVgzmjamngLg18OJk+JgijLxPmCaCgxARUJ6vePGZxprexWRS
NwDoL15kAgKEmNz/JxebQppN7H4nIcivMX4bCd1hQqgsC9eX8kZPIMs9KD2CduoC6z5HpL7WEf3b
eco5NuwDL6twFvT6NmmSqTL1JhOTZ8rnM5RGtgTXM+OyzwPp37v/F3JFOFCQGKcPog==


--===============2189924896498789937==--