revision-id: b6188f3823dedf32a53f312ae086564676328b0f (fb-prod201903-260-gb6188f3823d) parent(s): 86500865916f729216b7081f4bdc2cd9c0c37e70 author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2019-11-26 20:29:22 +0300 message: Make the tests pass - Fix a bug in RocksDB's range locking - Don't run rocksdb.concurrent_delete with range_locking. --- mysql-test/suite/rocksdb/t/rocksdb_concurrent_delete.test | 4 ++++ rocksdb | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/mysql-test/suite/rocksdb/t/rocksdb_concurrent_delete.test b/mysql-test/suite/rocksdb/t/rocksdb_concurrent_delete.test index 47818bfdbe1..3aa51b7be80 100644 --- a/mysql-test/suite/rocksdb/t/rocksdb_concurrent_delete.test +++ b/mysql-test/suite/rocksdb/t/rocksdb_concurrent_delete.test @@ -27,6 +27,10 @@ # In all cases, RR gets snapshot conflict errors if non-first rows get # deleted by another transaction after scanning. +# The tests do not work with range locking as it locks it is about to +# read, first. +--source suite/rocksdb/include/not_range_locking.inc + --source include/have_rocksdb.inc --source include/have_debug_sync.inc diff --git a/rocksdb b/rocksdb index 670bbd25c10..d09b88fb9ee 160000 --- a/rocksdb +++ b/rocksdb @@ -1 +1 @@ -Subproject commit 670bbd25c10c47638f41ee7f635a99443d21e937 +Subproject commit d09b88fb9ee1ebdb13cedf5f6b49bea268188366