revision-id: 85cebce065b7e2880fa33db34673ede2b9fd391c (fb-prod201801-185-g85cebce065b) parent(s): 3678471e22559f53dc0f238844fb50dbbb0b55cb author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2019-01-07 18:58:48 +0300 message: Switch rocksdb.range_locking test from -master.opt file to relying on 'combinations' This will avoid running the test three times. --- mysql-test/suite/rocksdb/t/range_locking-master.opt | 1 - mysql-test/suite/rocksdb/t/range_locking.test | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/mysql-test/suite/rocksdb/t/range_locking-master.opt b/mysql-test/suite/rocksdb/t/range_locking-master.opt deleted file mode 100644 index cce6bc574ab..00000000000 --- a/mysql-test/suite/rocksdb/t/range_locking-master.opt +++ /dev/null @@ -1 +0,0 @@ ---rocksdb_use_range_locking=1 diff --git a/mysql-test/suite/rocksdb/t/range_locking.test b/mysql-test/suite/rocksdb/t/range_locking.test index b0f5157f304..40743f1bf63 100644 --- a/mysql-test/suite/rocksdb/t/range_locking.test +++ b/mysql-test/suite/rocksdb/t/range_locking.test @@ -3,6 +3,8 @@ # --source include/have_rocksdb.inc +--source suite/rocksdb/include/have_range_locking.inc + --enable_connect_log