branches/zip:

btr_cur_optimistic_insert(): Replace page_cur_insert_rec_low()
with page_cur_tuple_insert().

btr_cur_pessimistic_update(): Add the columns of big_rec_vec to ext_vect,
so that the "extern storage" bits will be set correctly in
btr_cur_insert_if_possible().

btr/btr0cur.c

@@ -1108,8 +1108,8 @@ btr_cur_optimistic_insert(
 	/* Now, try the insert */
 	page_zip = buf_block_get_page_zip(buf_block_align(page));
 
-	*rec = page_cur_insert_rec_low(page_cursor, page_zip,
-				entry, index, NULL, NULL, ext, n_ext, mtr);
+	*rec = page_cur_tuple_insert(page_cursor, page_zip,
+					entry, index, ext, n_ext, mtr);
 	if (UNIV_UNLIKELY(!(*rec))) {
 		/* If the record did not fit, reorganize */
 		if (UNIV_UNLIKELY(!btr_page_reorganize(page, index, mtr))) {
@@ -2008,6 +2008,12 @@ btr_cur_pessimistic_update(
 			err = DB_TOO_BIG_RECORD;
 			goto return_after_reservations;
 		}
+
+		/* Add the externally stored records. */
+		for (i = 0; i < big_rec_vec->n_fields; i++) {
+			ext_vect[n_ext_vect++] =
+					big_rec_vec->fields[i].field_no;
+		}
 	}
 
 	page_cursor = btr_cur_get_page_cur(cursor);