mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-21 06:22:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

branches/zip: Minor fixes for BLOB handling.

Browse source 
page_zip_get_n_prev_extern(): Ignore deleted records.

page_zip_write_rec(): Remove bogus debug assertion about the BLOB pointer
being zero-filled.  It would fail when reallocating records from the page
heap or when updating records in place.
This commit is contained in:
marko 2006-03-30 11:47:10 +00:00
parent 3595891399
commit b63ff3bedb
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
page/page0zip.c
View file

@ -181,7 +181,7 @@ page_zip_dir_get(
/**********************************************************
Determine how many externally stored columns are contained
in records with smaller heap_no than rec. */
in existing records with smaller heap_no than rec. */
static
ulint
page_zip_get_n_prev_extern(
@ -197,7 +197,7 @@ page_zip_get_n_prev_extern(
ulint i;
ulint left;
ulint heap_no;
ulint n_recs = page_dir_get_n_heap((page_t*) page_zip->data) - 2;
ulint n_recs = page_get_n_recs((page_t*) page_zip->data);
ut_ad(page_is_leaf(page));
ut_ad(page_is_comp(page));
@ -223,7 +223,6 @@ page_zip_get_n_prev_extern(
}
}
ut_a(!left);
return(n_ext);
}
@ -2044,7 +2043,7 @@ page_zip_write_rec(
ulint blob_no = page_zip_get_n_prev_extern(
page_zip, rec, index);
byte* ext_end = externs - page_zip->n_blobs
* BTR_EXTERN_FIELD_REF_SIZE;
* BTR_EXTERN_FIELD_REF_SIZE;
ut_ad(blob_no <= page_zip->n_blobs);
externs -= blob_no * BTR_EXTERN_FIELD_REF_SIZE;
@ -2112,8 +2111,6 @@ page_zip_write_rec(
/* Store the BLOB pointer separately. */
externs -= BTR_EXTERN_FIELD_REF_SIZE;
ut_ad(data < externs);
ut_ad(!memcmp(externs, zero,
BTR_EXTERN_FIELD_REF_SIZE));
memcpy(externs, src,
BTR_EXTERN_FIELD_REF_SIZE);
}