Skip to content

Commit 7c4ebec

Browse files
committed
MariaRocks: trivial post-merge test fixes
1 parent 302ec9a commit 7c4ebec

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

mysql-test/include/have_rocksdb.opt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@
99
--loose-enable-rocksdb_cfstats
1010
--loose-enable-rocksdb_lock_info
1111
--loose-enable-rocksdb_trx
12+
--loose-enable-rocksdb_locks

storage/rocksdb/mysql-test/rocksdb/t/rocksdb_deadlock_stress.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ set @prior_rocksdb_deadlock_detect = @@rocksdb_deadlock_detect;
1111
set global rocksdb_lock_wait_timeout = 100000;
1212
set global rocksdb_deadlock_detect = ON;
1313

14-
exec python suite/rocksdb/t/rocksdb_deadlock_stress.py root 127.0.0.1 $MASTER_MYPORT test t1 10000 10;
14+
exec python ../storage/rocksdb/mysql-test/rocksdb/t/rocksdb_deadlock_stress.py root 127.0.0.1 $MASTER_MYPORT test t1 10000 10;
1515

1616
set global rocksdb_lock_wait_timeout = @prior_rocksdb_lock_wait_timeout;
1717
set global rocksdb_deadlock_detect = @prior_rocksdb_deadlock_detect;

0 commit comments

Comments
 (0)