mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 14:02:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

branches/zip:

Browse source 
Slightly improve error handling.
This commit is contained in:
marko 2005-11-02 07:51:47 +00:00
parent 3ba94cbe8e
commit 7de5fd6d97
1 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
btr/btr0cur.c
View file

@ -2303,12 +2303,15 @@ btr_cur_del_mark_set_clust_rec(
rw_lock_x_lock(&btr_search_latch);
}
btr_rec_set_deleted_flag(rec, page_zip, val);
if (!btr_rec_set_deleted_flag(rec, page_zip/* 5 bytes */, val)) {
/* page_zip_alloc() said there is enough space */
ut_error;
}
trx = thr_get_trx(thr);
if (!(flags & BTR_KEEP_SYS_FLAG)) {
row_upd_rec_sys_fields(rec, page_zip,
row_upd_rec_sys_fields(rec, page_zip/* 21 bytes */,
index, offsets, trx, roll_ptr);
}
@ -2399,6 +2402,7 @@ btr_cur_parse_del_mark_set_sec_rec(
if (!btr_rec_set_deleted_flag(rec, page_zip, val)) {
/* page_zip overflow should have been detected
before writing MLOG_COMP_REC_SEC_DELETE_MARK */
ut_error;
}
}
@ -2451,7 +2455,14 @@ btr_cur_del_mark_set_sec_rec(
}
if (!btr_rec_set_deleted_flag(rec, page_zip, val)) {
ut_error; /* TODO */
/* Reorganize to try to get more modification log space. */
btr_page_reorganize(buf_block_get_frame(block),
cursor->index, mtr);
if (!btr_rec_set_deleted_flag(rec, page_zip, val)) {
/* TODO: could we do anything else than crash? */
ut_error;
}
}
if (block->is_hashed) {
@ -2474,9 +2485,11 @@ btr_cur_del_unmark_for_ibuf(
mtr_t* mtr) /* in: mtr */
{
/* We do not need to reserve btr_search_latch, as the page has just
been read to the buffer pool and there cannot be a hash index to it. */
/* The insert buffer is not used on compressed pages. */
ut_ad(!buf_block_get_page_zip(buf_block_align(rec)));
btr_rec_set_deleted_flag(rec, NULL, FALSE);
btr_cur_del_mark_set_sec_rec_log(rec, FALSE, mtr);