mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-07 15:45:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge mariadb-10.4.8 to 10.4

Browse source
This commit is contained in:
Marko Mäkelä 2019-09-10 16:09:14 +03:00
commit e980cf91cd
22 changed files with 318 additions and 158 deletions
Download patch file Download diff file Expand all files Collapse all files

1
storage/rocksdb/mysql-test/rocksdb/r/ttl_primary_read_filtering.result
View file

@ -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,

2
storage/rocksdb/mysql-test/rocksdb/suite.pm
View file

@ -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(

2
storage/rocksdb/mysql-test/rocksdb/t/ttl_primary_read_filtering.test
View file

@ -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 (

2
storage/rocksdb/mysql-test/rocksdb_rpl/suite.pm
View file

@ -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(

2
storage/rocksdb/mysql-test/rocksdb_stress/suite.pm
View file

@ -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(

2
storage/rocksdb/mysql-test/rocksdb_sys_vars/suite.pm
View file

@ -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(