revision-id: 2f7634aa98f2413a383db8fd5a848571a134eb13 (fb-prod201801-171-g2f7634aa98f) parent(s): ed5c828882cf85ffa53e33c350d9cebb10f72a4b author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2018-11-30 14:14:00 +0300 message: Update rocksdb.test with new default for rocksdb_max_lock_memory Also update to latest rocksdb branch with range locking --- mysql-test/suite/rocksdb/r/rocksdb.result | 2 +- rocksdb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mysql-test/suite/rocksdb/r/rocksdb.result b/mysql-test/suite/rocksdb/r/rocksdb.result index 28620d09368..9b6f553df06 100644 --- a/mysql-test/suite/rocksdb/r/rocksdb.result +++ b/mysql-test/suite/rocksdb/r/rocksdb.result @@ -931,7 +931,7 @@ rocksdb_manual_wal_flush ON rocksdb_master_skip_tx_api OFF rocksdb_max_background_jobs 2 rocksdb_max_latest_deadlocks 5 -rocksdb_max_lock_memory 16777216 +rocksdb_max_lock_memory 1073741824 rocksdb_max_log_file_size 0 rocksdb_max_manifest_file_size 1073741824 rocksdb_max_manual_compactions 10 diff --git a/rocksdb b/rocksdb index 0ba14a1efa8..0320154e8fa 160000 --- a/rocksdb +++ b/rocksdb @@ -1 +1 @@ -Subproject commit 0ba14a1efa8f4cfccedc85c7efa317be35c60333 +Subproject commit 0320154e8fa4a3a24f1a65fec2487e490dfb8507