diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-21 18:06:31 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-21 18:06:31 +0300 |
| commit | 36f8cca6f31941ca6bf5f45cbfdbc9ea676707d9 (patch) | |
| tree | f108b3fb41444b17062293e107879234ca557de5 /storage | |
| parent | 489ef007bec398c3b7b628325b225c3a015922cf (diff) | |
| parent | f9b856b0525dd9d82a9b42be690a26a295c73c64 (diff) | |
| download | mariadb-git-36f8cca6f31941ca6bf5f45cbfdbc9ea676707d9.tar.gz | |
Merge 10.3 into 10.4st-10.4-merge
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/unittest/innodb_fts-t.cc | 4 | ||||
| -rw-r--r-- | storage/rocksdb/mysql-test/rocksdb/suite.pm | 2 | ||||
| -rw-r--r-- | storage/rocksdb/mysql-test/rocksdb_rpl/suite.pm | 2 | ||||
| -rw-r--r-- | storage/rocksdb/mysql-test/rocksdb_stress/suite.pm | 2 | ||||
| -rw-r--r-- | storage/rocksdb/mysql-test/rocksdb_sys_vars/suite.pm | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/storage/innobase/unittest/innodb_fts-t.cc b/storage/innobase/unittest/innodb_fts-t.cc index 4e10c0e439e..72a4ca3ae78 100644 --- a/storage/innobase/unittest/innodb_fts-t.cc +++ b/storage/innobase/unittest/innodb_fts-t.cc @@ -45,8 +45,8 @@ int main(int, char**) !memcmp(&fts_info[i].buf, buf, len) && fts_decode_vlc(&fts_buf) == fts_info[i].val && fts_buf == &buf[len]) - ok(true, "FTS Encoded for %d bytes", fts_info[i].len); + ok(true, "FTS Encoded for %zu bytes", fts_info[i].len); else - ok(false, "FTS Encoded for %d bytes", fts_info[i].len); + ok(false, "FTS Encoded for %zu bytes", fts_info[i].len); } } diff --git a/storage/rocksdb/mysql-test/rocksdb/suite.pm b/storage/rocksdb/mysql-test/rocksdb/suite.pm index 633e883f46d..b4feb20a451 100644 --- a/storage/rocksdb/mysql-test/rocksdb/suite.pm +++ b/storage/rocksdb/mysql-test/rocksdb/suite.pm @@ -15,7 +15,7 @@ use strict; my $sst_dump= ::mtr_exe_maybe_exists( - "$::bindir/storage/rocksdb$::opt_vs_config/sst_dump", + "$::bindir/storage/rocksdb$::multiconfig/sst_dump", "$::path_client_bindir/sst_dump"); return "RocksDB is not compiled, no sst_dump" unless $sst_dump; $ENV{MARIAROCKS_SST_DUMP}="$sst_dump"; diff --git a/storage/rocksdb/mysql-test/rocksdb_rpl/suite.pm b/storage/rocksdb/mysql-test/rocksdb_rpl/suite.pm index 1cc123b2a2a..7e9fba4a59c 100644 --- a/storage/rocksdb/mysql-test/rocksdb_rpl/suite.pm +++ b/storage/rocksdb/mysql-test/rocksdb_rpl/suite.pm @@ -13,7 +13,7 @@ use strict; my $sst_dump= ::mtr_exe_maybe_exists( - "$::bindir/storage/rocksdb$::opt_vs_config/sst_dump", + "$::bindir/storage/rocksdb$::multiconfig/sst_dump", "$::path_client_bindir/sst_dump"); return "RocksDB is not compiled, no sst_dump" unless $sst_dump; $ENV{MARIAROCKS_SST_DUMP}="$sst_dump"; diff --git a/storage/rocksdb/mysql-test/rocksdb_stress/suite.pm b/storage/rocksdb/mysql-test/rocksdb_stress/suite.pm index 106a1d6a0e7..66a46291a8c 100644 --- a/storage/rocksdb/mysql-test/rocksdb_stress/suite.pm +++ b/storage/rocksdb/mysql-test/rocksdb_stress/suite.pm @@ -15,7 +15,7 @@ use strict; my $sst_dump= ::mtr_exe_maybe_exists( - "$::bindir/storage/rocksdb$::opt_vs_config/sst_dump", + "$::bindir/storage/rocksdb$::multiconfig/sst_dump", "$::path_client_bindir/sst_dump"); return "RocksDB is not compiled, no sst_dump" unless $sst_dump; $ENV{MARIAROCKS_SST_DUMP}="$sst_dump"; diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/suite.pm b/storage/rocksdb/mysql-test/rocksdb_sys_vars/suite.pm index 5264d657ef7..d50f4d2422e 100644 --- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/suite.pm +++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/suite.pm @@ -12,7 +12,7 @@ use strict; my $sst_dump= ::mtr_exe_maybe_exists( - "$::bindir/storage/rocksdb$::opt_vs_config/sst_dump", + "$::bindir/storage/rocksdb$::multiconfig/sst_dump", "$::path_client_bindir/sst_dump"); return "RocksDB is not compiled, no sst_dump" unless $sst_dump; $ENV{MARIAROCKS_SST_DUMP}="$sst_dump"; |