mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-16 11:57:38 +02:00
Code Issues Projects Releases Packages Wiki Activity

InnoDB 5.6.21

Browse source
This commit is contained in:
Sergei Golubchik 2014-11-20 16:59:22 +01:00
commit a9a6bd5256
22 changed files with 556 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

12
storage/innobase/row/row0ins.cc
View file

@ -1946,7 +1946,7 @@ row_ins_scan_sec_index_for_duplicate(
do {
const rec_t* rec = btr_pcur_get_rec(&pcur);
const buf_block_t* block = btr_pcur_get_block(&pcur);
ulint lock_type;
const ulint lock_type = LOCK_ORDINARY;
if (page_rec_is_infimum(rec)) {
@ -1956,16 +1956,6 @@ row_ins_scan_sec_index_for_duplicate(
offsets = rec_get_offsets(rec, index, offsets,
ULINT_UNDEFINED, &offsets_heap);
/* If the transaction isolation level is no stronger than
READ COMMITTED, then avoid gap locks. */
if (!page_rec_is_supremum(rec)
&& thr_get_trx(thr)->isolation_level
<= TRX_ISO_READ_COMMITTED) {
lock_type = LOCK_REC_NOT_GAP;
} else {
lock_type = LOCK_ORDINARY;
}
if (flags & BTR_NO_LOCKING_FLAG) {
/* Set no locks when applying log
in online table rebuild. */