diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2009-09-08 20:04:58 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2009-09-08 20:04:58 +0400 |
| commit | 241c1977dd1d0614c4d6400fa981e7f7facbd153 (patch) | |
| tree | 86e5f9ce0d8918d98f3fde0a8bf6939815c7af65 /storage/xtradb/lock | |
| parent | 29f0dcb56337a3e352ad7a70dcff6b25bb605325 (diff) | |
| parent | 56bca79f6a2ca554fb59a208e2b160dcb905113d (diff) | |
| download | mariadb-git-241c1977dd1d0614c4d6400fa981e7f7facbd153.tar.gz | |
Merge xtradb-7 -> MariaDB
Diffstat (limited to 'storage/xtradb/lock')
| -rw-r--r-- | storage/xtradb/lock/lock0lock.c | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/storage/xtradb/lock/lock0lock.c b/storage/xtradb/lock/lock0lock.c index 3730c66313d..9e90e099428 100644 --- a/storage/xtradb/lock/lock0lock.c +++ b/storage/xtradb/lock/lock0lock.c @@ -1976,12 +1976,6 @@ lock_rec_lock_fast( if (lock == NULL) { if (!impl) { lock_rec_create(mode, block, heap_no, index, trx); - - if (srv_locks_unsafe_for_binlog - || trx->isolation_level - == TRX_ISO_READ_COMMITTED) { - trx_register_new_rec_lock(trx, index); - } } return(TRUE); @@ -2005,11 +1999,6 @@ lock_rec_lock_fast( if (!lock_rec_get_nth_bit(lock, heap_no)) { lock_rec_set_nth_bit(lock, heap_no); - if (srv_locks_unsafe_for_binlog - || trx->isolation_level - == TRX_ISO_READ_COMMITTED) { - trx_register_new_rec_lock(trx, index); - } } } @@ -2069,22 +2058,12 @@ lock_rec_lock_slow( err = lock_rec_enqueue_waiting(mode, block, heap_no, index, thr); - - if (srv_locks_unsafe_for_binlog - || trx->isolation_level == TRX_ISO_READ_COMMITTED) { - trx_register_new_rec_lock(trx, index); - } } else { if (!impl) { /* Set the requested lock on the record */ lock_rec_add_to_queue(LOCK_REC | mode, block, heap_no, index, trx); - if (srv_locks_unsafe_for_binlog - || trx->isolation_level - == TRX_ISO_READ_COMMITTED) { - trx_register_new_rec_lock(trx, index); - } } err = DB_SUCCESS; |