diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-08-08 14:21:22 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-08-08 14:21:22 -0400 |
| commit | 91acc8b16fdd8409765f32b5453851366552a709 (patch) | |
| tree | 18c04064e9fc127c5e477ec08613aae7baaab2ae /storage/xtradb/lock | |
| parent | 4c69dc8116950d6bf0b09bfbc31a86d89831a364 (diff) | |
| parent | 0403790722e3941779ccea26e85fcd818e2320b5 (diff) | |
| download | mariadb-git-91acc8b16fdd8409765f32b5453851366552a709.tar.gz | |
Merge tag 'mariadb-10.0.21' into 10.0-galera
Diffstat (limited to 'storage/xtradb/lock')
| -rw-r--r-- | storage/xtradb/lock/lock0lock.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/xtradb/lock/lock0lock.cc b/storage/xtradb/lock/lock0lock.cc index 323994a6937..54dd69a726e 100644 --- a/storage/xtradb/lock/lock0lock.cc +++ b/storage/xtradb/lock/lock0lock.cc @@ -3029,7 +3029,8 @@ lock_rec_inherit_to_gap( && !((srv_locks_unsafe_for_binlog || lock->trx->isolation_level <= TRX_ISO_READ_COMMITTED) - && lock_get_mode(lock) == LOCK_X)) { + && lock_get_mode(lock) == + (lock->trx->duplicates ? LOCK_S : LOCK_X))) { lock_rec_add_to_queue( LOCK_REC | LOCK_GAP | lock_get_mode(lock), |