diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2019-09-06 16:57:54 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-09-06 16:58:39 +0200 |
| commit | f80e02e043103ab4e6ca12d9efffec6eb9aa3b74 (patch) | |
| tree | f0ab69f11d47bc99139216e839c54c7b29711146 /storage/rocksdb/mysql-test | |
| parent | 2842c369851a8afc2a944ce6f4f60fa052f20969 (diff) | |
| parent | 39e5b76ef1e68c0aed0b0f6941d517a986fe8821 (diff) | |
| download | mariadb-git-f80e02e043103ab4e6ca12d9efffec6eb9aa3b74.tar.gz | |
Merge branch '10.2' into 10.3
Diffstat (limited to 'storage/rocksdb/mysql-test')
6 files changed, 7 insertions, 4 deletions
diff --git a/storage/rocksdb/mysql-test/rocksdb/r/ttl_primary_read_filtering.result b/storage/rocksdb/mysql-test/rocksdb/r/ttl_primary_read_filtering.result index c66b17926b7..558924e6513 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/ttl_primary_read_filtering.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/ttl_primary_read_filtering.result @@ -76,6 +76,7 @@ select variable_value-@a from information_schema.global_status where variable_na variable_value-@a 4 DROP TABLE t1; +set global ROCKSDB_COMPACT_CF= 'default'; CREATE TABLE t1 ( a int, b int, diff --git a/storage/rocksdb/mysql-test/rocksdb/suite.pm b/storage/rocksdb/mysql-test/rocksdb/suite.pm index e4f074df471..633e883f46d 100644 --- a/storage/rocksdb/mysql-test/rocksdb/suite.pm +++ b/storage/rocksdb/mysql-test/rocksdb/suite.pm @@ -11,7 +11,7 @@ use My::Find; use File::Basename; use strict; -sub is_default { not $::opt_embedded_server } +#sub is_default { not $::opt_embedded_server } my $sst_dump= ::mtr_exe_maybe_exists( diff --git a/storage/rocksdb/mysql-test/rocksdb/t/ttl_primary_read_filtering.test b/storage/rocksdb/mysql-test/rocksdb/t/ttl_primary_read_filtering.test index 4e8b081c4d5..7a7609f456e 100644 --- a/storage/rocksdb/mysql-test/rocksdb/t/ttl_primary_read_filtering.test +++ b/storage/rocksdb/mysql-test/rocksdb/t/ttl_primary_read_filtering.test @@ -102,6 +102,8 @@ SELECT * FROM t1; select variable_value-@a from information_schema.global_status where variable_name='rocksdb_rows_filtered'; DROP TABLE t1; +# Compact away the dropped data +set global ROCKSDB_COMPACT_CF= 'default'; # Read filtering index scan tests (None of these queries should return any results) CREATE TABLE t1 ( diff --git a/storage/rocksdb/mysql-test/rocksdb_rpl/suite.pm b/storage/rocksdb/mysql-test/rocksdb_rpl/suite.pm index 79c630f87f1..1cc123b2a2a 100644 --- a/storage/rocksdb/mysql-test/rocksdb_rpl/suite.pm +++ b/storage/rocksdb/mysql-test/rocksdb_rpl/suite.pm @@ -9,7 +9,7 @@ use My::Find; use File::Basename; use strict; -sub is_default { not $::opt_embedded_server } +#sub is_default { not $::opt_embedded_server } my $sst_dump= ::mtr_exe_maybe_exists( diff --git a/storage/rocksdb/mysql-test/rocksdb_stress/suite.pm b/storage/rocksdb/mysql-test/rocksdb_stress/suite.pm index 3423d34ded5..106a1d6a0e7 100644 --- a/storage/rocksdb/mysql-test/rocksdb_stress/suite.pm +++ b/storage/rocksdb/mysql-test/rocksdb_stress/suite.pm @@ -11,7 +11,7 @@ use My::Find; use File::Basename; use strict; -sub is_default { not $::opt_embedded_server } +#sub is_default { not $::opt_embedded_server } my $sst_dump= ::mtr_exe_maybe_exists( diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/suite.pm b/storage/rocksdb/mysql-test/rocksdb_sys_vars/suite.pm index c8452b55227..5264d657ef7 100644 --- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/suite.pm +++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/suite.pm @@ -8,7 +8,7 @@ use My::Find; use File::Basename; use strict; -sub is_default { not $::opt_embedded_server } +#sub is_default { not $::opt_embedded_server } my $sst_dump= ::mtr_exe_maybe_exists( |