summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Petrunia <psergey@askmonty.org>2017-12-20 19:49:56 +0300
committerSergei Petrunia <psergey@askmonty.org>2017-12-20 19:49:56 +0300
commit73fa7aeb203299d8d358f8f6b4cdd58aa9f1d0ec (patch)
tree11dc173067190d5f3a535ad6d9ffa54f92d1b869
parent21eed925a0e374c9f643d32544d3468954435ebc (diff)
downloadmariadb-git-73fa7aeb203299d8d358f8f6b4cdd58aa9f1d0ec.tar.gz
MDEV-14165: not MyRocks -problem in ps-protocol, happens in upstream too
Enable the test back, as the fix has been pushed.
-rw-r--r--storage/rocksdb/mysql-test/rocksdb/t/disabled.def1
1 files changed, 0 insertions, 1 deletions
diff --git a/storage/rocksdb/mysql-test/rocksdb/t/disabled.def b/storage/rocksdb/mysql-test/rocksdb/t/disabled.def
index 1c4bdf1b082..91bbe7fe30e 100644
--- a/storage/rocksdb/mysql-test/rocksdb/t/disabled.def
+++ b/storage/rocksdb/mysql-test/rocksdb/t/disabled.def
@@ -41,7 +41,6 @@ rocksdb_deadlock_stress_rr: stress test
##
persistent_cache: Upstream RocksDB bug https://github.com/facebook/mysql-5.6/issues/579
collation: Fails on gcc 4.8 and before, MDEV-12433
-col_opt_zerofill: MDEV-14165: not MyRocks -problem in ps-protocol, happens in upstream too
##