revision-id: fc2597b6082d85d6f88a66bb08d619dcdf51a74e (fb-prod201801-169-gfc2597b6082) parent(s): 9447f482b2d086ee644f02caba9ce0d225bdd514 author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2018-11-27 00:31:49 +0300 message: Disable rocksdb.rocksdb_locks and rocksdb.lock_info in range locking mode --- mysql-test/suite/rocksdb/t/lock_info.test | 2 +- mysql-test/suite/rocksdb/t/rocksdb_locks.test | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/mysql-test/suite/rocksdb/t/lock_info.test b/mysql-test/suite/rocksdb/t/lock_info.test index cd7359c8547..a277c1b8d8d 100644 --- a/mysql-test/suite/rocksdb/t/lock_info.test +++ b/mysql-test/suite/rocksdb/t/lock_info.test @@ -1,7 +1,7 @@ --source include/have_rocksdb.inc # Range Locking supports I_S.lock_info but its printout is different (see range_locking.test) -#--source suite/rocksdb/include/not_range_locking.inc +--source suite/rocksdb/include/not_range_locking.inc --disable_warnings DROP TABLE IF EXISTS t1; diff --git a/mysql-test/suite/rocksdb/t/rocksdb_locks.test b/mysql-test/suite/rocksdb/t/rocksdb_locks.test index 9a25f39a8e3..37e5e105542 100644 --- a/mysql-test/suite/rocksdb/t/rocksdb_locks.test +++ b/mysql-test/suite/rocksdb/t/rocksdb_locks.test @@ -5,6 +5,9 @@ # --source include/have_debug.inc +# Range locking requests locks before doing snapshot checking. +--source suite/rocksdb/include/not_range_locking.inc + --enable_connect_log create table t1 (pk int not null primary key) engine=rocksdb;