Commit 60b96319 authored by Zardosht Kasheff's avatar Zardosht Kasheff Committed by Yoni Fogel

closes #5822, don't grab point write lock if DB_PRELOCKED_WRITE is passed into...

closes #5822, don't grab point write lock if DB_PRELOCKED_WRITE is passed into dbenv->update_multiple

git-svn-id: file:///svn/toku/tokudb@48681 c7de825b-a66e-492c-adef-691d508d4ae1
parent 0bacc4a0
...@@ -778,7 +778,7 @@ env_update_multiple(DB_ENV *env, DB *src_db, DB_TXN *txn, ...@@ -778,7 +778,7 @@ env_update_multiple(DB_ENV *env, DB *src_db, DB_TXN *txn,
if (r != 0) goto cleanup; if (r != 0) goto cleanup;
// lock new key // lock new key
if (db->i->lt) { if (db->i->lt && !(lock_flags[which_db] & DB_PRELOCKED_WRITE)) {
r = get_point_write_lock(db, txn, &curr_new_key); r = get_point_write_lock(db, txn, &curr_new_key);
if (r != 0) goto cleanup; if (r != 0) goto cleanup;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment