diff options
| author | Sergei Petrunia <psergey@askmonty.org> | 2017-01-02 00:06:26 +0000 |
|---|---|---|
| committer | Sergei Petrunia <psergey@askmonty.org> | 2017-01-02 00:06:26 +0000 |
| commit | 7c4ebec82d1ad9e39c274e27ee7545368df55df7 (patch) | |
| tree | d8d78e739c615bc2254f39a506c4b6b4b1f2af25 | |
| parent | 302ec9ab26a46e011b502daaf5ef972729d498eb (diff) | |
| download | mariadb-git-7c4ebec82d1ad9e39c274e27ee7545368df55df7.tar.gz | |
MariaRocks: trivial post-merge test fixes
| -rw-r--r-- | mysql-test/include/have_rocksdb.opt | 1 | ||||
| -rw-r--r-- | storage/rocksdb/mysql-test/rocksdb/t/rocksdb_deadlock_stress.inc | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/include/have_rocksdb.opt b/mysql-test/include/have_rocksdb.opt index 7415665b92d..36d7dda1609 100644 --- a/mysql-test/include/have_rocksdb.opt +++ b/mysql-test/include/have_rocksdb.opt @@ -9,3 +9,4 @@ --loose-enable-rocksdb_cfstats --loose-enable-rocksdb_lock_info --loose-enable-rocksdb_trx +--loose-enable-rocksdb_locks diff --git a/storage/rocksdb/mysql-test/rocksdb/t/rocksdb_deadlock_stress.inc b/storage/rocksdb/mysql-test/rocksdb/t/rocksdb_deadlock_stress.inc index e164591ddec..c88c7ebd20a 100644 --- a/storage/rocksdb/mysql-test/rocksdb/t/rocksdb_deadlock_stress.inc +++ b/storage/rocksdb/mysql-test/rocksdb/t/rocksdb_deadlock_stress.inc @@ -11,7 +11,7 @@ set @prior_rocksdb_deadlock_detect = @@rocksdb_deadlock_detect; set global rocksdb_lock_wait_timeout = 100000; set global rocksdb_deadlock_detect = ON; -exec python suite/rocksdb/t/rocksdb_deadlock_stress.py root 127.0.0.1 $MASTER_MYPORT test t1 10000 10; +exec python ../storage/rocksdb/mysql-test/rocksdb/t/rocksdb_deadlock_stress.py root 127.0.0.1 $MASTER_MYPORT test t1 10000 10; set global rocksdb_lock_wait_timeout = @prior_rocksdb_lock_wait_timeout; set global rocksdb_deadlock_detect = @prior_rocksdb_deadlock_detect; |