revision-id: 52eb05359d8e8ab2b3f425a5299fbfc2ff510946 (fb-prod201801-166-g52eb05359d8) parent(s): 36f310f32dff0d34cb21a66afbcaec955d0642bc author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2018-11-20 00:41:09 +0300 message: Range Locking test coverage Add rocksdb_use_range_locking=1 into 'combinations' so all tests are also run with Range Locking by default. Some tests still fail. Disable rocksdb.rocksdb in Range Locking mode as an example. --- mysql-test/suite/rocksdb/combinations | 3 +++ mysql-test/suite/rocksdb/include/not_range_locking.inc | 5 +++++ mysql-test/suite/rocksdb/t/rocksdb.test | 3 +++ 3 files changed, 11 insertions(+) diff --git a/mysql-test/suite/rocksdb/combinations b/mysql-test/suite/rocksdb/combinations index b7316c71485..c9a4494607a 100644 --- a/mysql-test/suite/rocksdb/combinations +++ b/mysql-test/suite/rocksdb/combinations @@ -3,3 +3,6 @@ rocksdb_write_policy=write_committed [write_prepared] rocksdb_write_policy=write_prepared + +[range_locking] +rocksdb_use_range_locking=1 diff --git a/mysql-test/suite/rocksdb/include/not_range_locking.inc b/mysql-test/suite/rocksdb/include/not_range_locking.inc new file mode 100644 index 00000000000..62c26b134bc --- /dev/null +++ b/mysql-test/suite/rocksdb/include/not_range_locking.inc @@ -0,0 +1,5 @@ +--let $_use_range_locking= `select @@rocksdb_use_range_locking` +if ($_use_range_locking == 1) +{ + --skip Test doesn't support range locking +} diff --git a/mysql-test/suite/rocksdb/t/rocksdb.test b/mysql-test/suite/rocksdb/t/rocksdb.test index cf8fb29e20f..09004b1bf57 100644 --- a/mysql-test/suite/rocksdb/t/rocksdb.test +++ b/mysql-test/suite/rocksdb/t/rocksdb.test @@ -1,6 +1,9 @@ --source include/have_rocksdb.inc --source suite/rocksdb/include/have_write_committed.inc +# Does SHOW WARNINGS and SHOW STATUS which change in Range Locking mode +--source suite/rocksdb/include/not_range_locking.inc + # # RocksDB Storage Engine tests #