Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
7c4ebec8
Commit
7c4ebec8
authored
Jan 02, 2017
by
Sergei Petrunia
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MariaRocks: trivial post-merge test fixes
parent
302ec9ab
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
1 deletion
+2
-1
mysql-test/include/have_rocksdb.opt
mysql-test/include/have_rocksdb.opt
+1
-0
storage/rocksdb/mysql-test/rocksdb/t/rocksdb_deadlock_stress.inc
.../rocksdb/mysql-test/rocksdb/t/rocksdb_deadlock_stress.inc
+1
-1
No files found.
mysql-test/include/have_rocksdb.opt
View file @
7c4ebec8
...
...
@@ -9,3 +9,4 @@
--loose-enable-rocksdb_cfstats
--loose-enable-rocksdb_lock_info
--loose-enable-rocksdb_trx
--loose-enable-rocksdb_locks
storage/rocksdb/mysql-test/rocksdb/t/rocksdb_deadlock_stress.inc
View file @
7c4ebec8
...
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment