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

branches/zip: btr_cur_optimistic_insert(): When returning DB_FAIL,

Browse source 
always convert back big_rec_vec.
This commit is contained in:
marko 2006-09-05 12:49:35 +00:00
parent d4d321ad85
commit 78357aa7c3
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
btr/btr0cur.c
View file

@ -1093,7 +1093,7 @@ btr_cur_optimistic_insert(
&& (0 == level)
&& (btr_page_get_split_rec_to_right(cursor, &dummy_rec)
|| btr_page_get_split_rec_to_left(cursor, &dummy_rec))) {
fail:
if (big_rec_vec) {
dtuple_convert_back_big_rec(index, entry, big_rec_vec);
}
@ -1106,10 +1106,7 @@ btr_cur_optimistic_insert(
|| (page_get_max_insert_size(page, 1) >= rec_size)
|| (page_get_n_recs(page) <= 1))) {
if (big_rec_vec) {
dtuple_convert_back_big_rec(index, entry, big_rec_vec);
}
return(DB_FAIL);
goto fail;
}
/* Check locks and write to the undo log, if specified */
@ -1156,7 +1153,7 @@ btr_cur_optimistic_insert(
if (UNIV_UNLIKELY(!btr_page_reorganize(page, index, mtr))) {
ut_a(page_zip);
return(DB_FAIL);
goto fail;
}
ut_ad(page_get_max_insert_size(page, 1) == max_size);
@ -1171,7 +1168,7 @@ btr_cur_optimistic_insert(
if (UNIV_UNLIKELY(!*rec)) {
if (UNIV_LIKELY(page_zip != NULL)) {
return(DB_FAIL);
goto fail;
}
fputs("InnoDB: Error: cannot insert tuple ", stderr);