diff options
| author | Sergei Petrunia <psergey@askmonty.org> | 2017-10-29 11:39:52 +0300 |
|---|---|---|
| committer | Sergei Petrunia <psergey@askmonty.org> | 2017-10-29 11:39:52 +0300 |
| commit | b6d48595477033fcbb1e26e5700f70ee58f47c54 (patch) | |
| tree | 36f301d415f878ccc53460ea1ac47c04686c2d43 | |
| parent | 8abe84008515dc821c47c23706e28ab5466d0174 (diff) | |
| download | mariadb-git-b6d48595477033fcbb1e26e5700f70ee58f47c54.tar.gz | |
MDEV-14181: rocksdb.rocksdb fails: line 1117: query 'reap' succeeded - should have failed
Fix a race condition in the testcase.
| -rw-r--r-- | storage/rocksdb/mysql-test/rocksdb/t/disabled.def | 1 | ||||
| -rw-r--r-- | storage/rocksdb/mysql-test/rocksdb/t/rocksdb.test | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/storage/rocksdb/mysql-test/rocksdb/t/disabled.def b/storage/rocksdb/mysql-test/rocksdb/t/disabled.def index 52b51231841..5699e8ccb7d 100644 --- a/storage/rocksdb/mysql-test/rocksdb/t/disabled.def +++ b/storage/rocksdb/mysql-test/rocksdb/t/disabled.def @@ -54,7 +54,6 @@ blind_delete_without_tx_api: MDEV-12286: rocksdb.blind_delete_without_tx_api tes persistent_cache: Upstream RocksDB bug https://github.com/facebook/mysql-5.6/issues/579 collation: Fails on gcc 4.8 and before, MDEV-12433 -rocksdb : Intermittent failures in BB unique_sec : Intermittent failures in BB # See also storage/rocksdb/mysql-test/rocksdb/suite.pm diff --git a/storage/rocksdb/mysql-test/rocksdb/t/rocksdb.test b/storage/rocksdb/mysql-test/rocksdb/t/rocksdb.test index 0089b62e0b9..5c8fa9ed443 100644 --- a/storage/rocksdb/mysql-test/rocksdb/t/rocksdb.test +++ b/storage/rocksdb/mysql-test/rocksdb/t/rocksdb.test @@ -1107,6 +1107,10 @@ set autocommit = 1; update t1 set a = sleep(100) where pk = 1; --connect (con1,localhost,root,,) + +let $wait_condition= select State='User sleep' from information_schema.processlist where id=$con_id; +--source include/wait_condition.inc + --echo kill query \$con_id; --disable_query_log eval kill query $con_id; |