diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-11-20 17:05:13 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-11-20 17:05:13 +0100 |
| commit | 32ec8625afd2b72afd8f96fd773342c8da9f0be1 (patch) | |
| tree | 9d46be3fa61a7f4d5fb8e724c308d9d9fba896a9 /storage/xtradb/row/row0ins.cc | |
| parent | a9a6bd5256ba5f983eae633c591391f2bf4dfc80 (diff) | |
| parent | b1e84da1012081a5c83f0670a9f222816578581b (diff) | |
| download | mariadb-git-32ec8625afd2b72afd8f96fd773342c8da9f0be1.tar.gz | |
XtraDB 5.6.21-70.0
Diffstat (limited to 'storage/xtradb/row/row0ins.cc')
| -rw-r--r-- | storage/xtradb/row/row0ins.cc | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/storage/xtradb/row/row0ins.cc b/storage/xtradb/row/row0ins.cc index d01f1080e5a..c0ea0304606 100644 --- a/storage/xtradb/row/row0ins.cc +++ b/storage/xtradb/row/row0ins.cc @@ -1958,7 +1958,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)) { @@ -1968,16 +1968,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. */ |