Browse Source

branches/zip: btr_rec_copy_externally_stored_field(): Add const qualifier

to rec_t*.  Remove the ut_ad(rec_offs_validate()), because this function
will be called from row0merge.c on a record that lacks the
REC_N_NEW_EXTRA_BYTES.
pull/374/head
marko 19 years ago
parent
commit
96f554c52a
  1. 5
      btr/btr0cur.c
  2. 2
      include/btr0cur.h

5
btr/btr0cur.c

@ -4708,7 +4708,7 @@ byte*
btr_rec_copy_externally_stored_field(
/*=================================*/
/* out: the field copied to heap */
rec_t* rec, /* in: record */
const rec_t* rec, /* in: record */
const ulint* offsets,/* in: array returned by rec_get_offsets() */
ulint zip_size,/* in: nonzero=compressed BLOB page size,
zero for uncompressed BLOBs */
@ -4717,9 +4717,8 @@ btr_rec_copy_externally_stored_field(
mem_heap_t* heap) /* in: mem heap */
{
ulint local_len;
byte* data;
const byte* data;
ut_ad(rec_offs_validate(rec, NULL, offsets));
ut_a(rec_offs_nth_extern(offsets, no));
/* An externally stored field can contain some initial

2
include/btr0cur.h

@ -551,7 +551,7 @@ byte*
btr_rec_copy_externally_stored_field(
/*=================================*/
/* out: the field copied to heap */
rec_t* rec, /* in: record */
const rec_t* rec, /* in: record */
const ulint* offsets,/* in: array returned by rec_get_offsets() */
ulint zip_size,/* in: nonzero=compressed BLOB page size,
zero for uncompressed BLOBs */

Loading…
Cancel
Save