diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2018-09-14 08:47:22 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2018-09-14 08:47:22 +0200 |
| commit | 28f08d3753eb10a1393a63e6c581d43aad9f93b9 (patch) | |
| tree | 86c9df8c3fb6d4ebd99d431697c84f06ef242989 /storage/tokudb/mysql-test/tokudb/suite.pm | |
| parent | 38665893087e20c3ad65d5b0e227a75185a4865e (diff) | |
| parent | f1bcfbb4373e40dda2c18c137f76fc6ff32e1a45 (diff) | |
| download | mariadb-git-28f08d3753eb10a1393a63e6c581d43aad9f93b9.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'storage/tokudb/mysql-test/tokudb/suite.pm')
| -rw-r--r-- | storage/tokudb/mysql-test/tokudb/suite.pm | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/storage/tokudb/mysql-test/tokudb/suite.pm b/storage/tokudb/mysql-test/tokudb/suite.pm index 6c52d0110fe..58694112e63 100644 --- a/storage/tokudb/mysql-test/tokudb/suite.pm +++ b/storage/tokudb/mysql-test/tokudb/suite.pm @@ -4,6 +4,12 @@ use File::Basename; # Ensure we can run the TokuDB tests even if hugepages are enabled $ENV{TOKU_HUGE_PAGES_OK}=1; +my $exe_tokuftdump= + ::mtr_exe_maybe_exists( + ::vs_config_dirs('storage/tokudb/PerconaFT/tools', 'tokuftdump'), + "$::path_client_bindir/tokuftdump", + "$::bindir/storage/tokudb/PerconaFT/tools/tokuftdump"); +$ENV{'MYSQL_TOKUFTDUMP'}= ::native_path($exe_tokuftdump); #return "Not run for embedded server" if $::opt_embedded_server; return "No TokuDB engine" unless $ENV{HA_TOKUDB_SO} or $::mysqld_variables{tokudb}; |