summaryrefslogtreecommitdiff
path: root/storage/rocksdb/mysql-test/rocksdb/t
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-09-23 17:35:29 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2019-09-23 17:35:29 +0300
commit5a92ccbaea1bb3973e23846a741f5694a1e687bd (patch)
treeaafc504552502b48b79cadcb06b2b5c7eba4f374 /storage/rocksdb/mysql-test/rocksdb/t
parentc997af7d1f432dfca922958453f0e2313287f1eb (diff)
parentc016ea660ede8b7ff75f8ca65f73e2958262263a (diff)
downloadmariadb-git-5a92ccbaea1bb3973e23846a741f5694a1e687bd.tar.gz
Merge 10.3 into 10.4
Disable MDEV-20576 assertions until MDEV-20595 has been fixed.
Diffstat (limited to 'storage/rocksdb/mysql-test/rocksdb/t')
-rw-r--r--storage/rocksdb/mysql-test/rocksdb/t/ttl_secondary_read_filtering.test3
1 files changed, 3 insertions, 0 deletions
diff --git a/storage/rocksdb/mysql-test/rocksdb/t/ttl_secondary_read_filtering.test b/storage/rocksdb/mysql-test/rocksdb/t/ttl_secondary_read_filtering.test
index d6be7d95f8d..f6042cc517e 100644
--- a/storage/rocksdb/mysql-test/rocksdb/t/ttl_secondary_read_filtering.test
+++ b/storage/rocksdb/mysql-test/rocksdb/t/ttl_secondary_read_filtering.test
@@ -121,6 +121,9 @@ SELECT * FROM t1 FORCE INDEX (kb);
DROP TABLE t1;
+# Compact away the dropped data
+set global rocksdb_compact_cf= 'default';
+
--echo # Read filtering index scan tests (None of these queries should return any results)
CREATE TABLE t1 (
a int,