revision-id: 4d681a1a64bbd5f2528f4c396777911c4ba9e2b8 (fb-prod201801-169-g4d681a1a64b) parent(s): 9447f482b2d086ee644f02caba9ce0d225bdd514 author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2018-11-29 22:50:47 +0300 message: Range locking: make more tests pass - Increase the default memory size for rocksdb_max_lock_memory (see MDEV-17874 for reasoning) - Update rocksdb to latest fixes --- rocksdb | 2 +- storage/rocksdb/ha_rocksdb.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rocksdb b/rocksdb index 0320154e8fa..0ba14a1efa8 160000 --- a/rocksdb +++ b/rocksdb @@ -1 +1 @@ -Subproject commit 0320154e8fa4a3a24f1a65fec2487e490dfb8507 +Subproject commit 0ba14a1efa8f4cfccedc85c7efa317be35c60333 diff --git a/storage/rocksdb/ha_rocksdb.cc b/storage/rocksdb/ha_rocksdb.cc index da75885cd36..d5d8ead4883 100644 --- a/storage/rocksdb/ha_rocksdb.cc +++ b/storage/rocksdb/ha_rocksdb.cc @@ -1718,7 +1718,7 @@ static MYSQL_SYSVAR_ULONG( max_lock_memory, rocksdb_max_lock_memory, PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY, "Max Lock Memory when using Range Locking (like in TokuDB)", - nullptr, nullptr, 16*1024*1024 /* default value */, 1024 /* min value */, + nullptr, nullptr, 1024*1024*1024 /* default value */, 1024 /* min value */, ULONG_MAX /* max value */, 0); static const int ROCKSDB_ASSUMED_KEY_VALUE_DISK_SIZE = 100;