mirror of
https://github.com/MariaDB/server.git
synced 2025-02-19 03:45:35 +01:00
Merge mysql-5.1 to mysql-5.5.
This commit is contained in:
commit
b252933551
2 changed files with 20 additions and 6 deletions
storage/innobase
|
@ -3604,11 +3604,18 @@ bitmap_fail:
|
||||||
|
|
||||||
root = ibuf_tree_root_get(&mtr);
|
root = ibuf_tree_root_get(&mtr);
|
||||||
|
|
||||||
err = btr_cur_pessimistic_insert(BTR_NO_LOCKING_FLAG
|
err = btr_cur_optimistic_insert(
|
||||||
| BTR_NO_UNDO_LOG_FLAG,
|
BTR_NO_LOCKING_FLAG | BTR_NO_UNDO_LOG_FLAG,
|
||||||
cursor,
|
cursor, ibuf_entry, &ins_rec,
|
||||||
ibuf_entry, &ins_rec,
|
&dummy_big_rec, 0, thr, &mtr);
|
||||||
&dummy_big_rec, 0, thr, &mtr);
|
|
||||||
|
if (err == DB_FAIL) {
|
||||||
|
err = btr_cur_pessimistic_insert(
|
||||||
|
BTR_NO_LOCKING_FLAG | BTR_NO_UNDO_LOG_FLAG,
|
||||||
|
cursor, ibuf_entry, &ins_rec,
|
||||||
|
&dummy_big_rec, 0, thr, &mtr);
|
||||||
|
}
|
||||||
|
|
||||||
mutex_exit(&ibuf_pessimistic_insert_mutex);
|
mutex_exit(&ibuf_pessimistic_insert_mutex);
|
||||||
ibuf_size_update(root, &mtr);
|
ibuf_size_update(root, &mtr);
|
||||||
mutex_exit(&ibuf_mutex);
|
mutex_exit(&ibuf_mutex);
|
||||||
|
|
|
@ -2168,9 +2168,16 @@ row_ins_index_entry_low(
|
||||||
|
|
||||||
goto function_exit;
|
goto function_exit;
|
||||||
}
|
}
|
||||||
err = btr_cur_pessimistic_insert(
|
|
||||||
|
err = btr_cur_optimistic_insert(
|
||||||
0, &cursor, entry, &insert_rec, &big_rec,
|
0, &cursor, entry, &insert_rec, &big_rec,
|
||||||
n_ext, thr, &mtr);
|
n_ext, thr, &mtr);
|
||||||
|
|
||||||
|
if (err == DB_FAIL) {
|
||||||
|
err = btr_cur_pessimistic_insert(
|
||||||
|
0, &cursor, entry, &insert_rec,
|
||||||
|
&big_rec, n_ext, thr, &mtr);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue