diff options
| author | Bjorn Munch <bjorn.bunch@oracle.com> | 2010-08-04 12:19:51 +0200 |
|---|---|---|
| committer | Bjorn Munch <bjorn.bunch@oracle.com> | 2010-08-04 12:19:51 +0200 |
| commit | f3f5e04a366d970ab4b90860b83350fbed0951c6 (patch) | |
| tree | 1a1cb5fc96303ac85e0da44ae692d52e7145a4ad /mysql-test/mysql-test-run.pl | |
| parent | 2d2da6e79359668111b24734be0f9011f289a281 (diff) | |
| parent | 22b86260dc274cee4d66f74b8178127ec4b47e72 (diff) | |
| download | mariadb-git-f3f5e04a366d970ab4b90860b83350fbed0951c6.tar.gz | |
merge from 5.1
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index d996b979d41..28665918e49 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -129,7 +129,7 @@ my $path_config_file; # The generated config file, var/my.cnf # executables will be used by the test suite. our $opt_vs_config = $ENV{'MTR_VS_CONFIG'}; -my $DEFAULT_SUITES= "main,binlog,federated,rpl,rpl_ndb,ndb,innodb"; +my $DEFAULT_SUITES= "main,binlog,federated,rpl,rpl_ndb,ndb,innodb,innodb_plugin"; my $opt_suites; our $opt_verbose= 0; # Verbose output, enable with --verbose @@ -2067,6 +2067,15 @@ sub environment_setup { "$basedir/myisam/myisampack")); # ---------------------------------------------------- + # mysqlhotcopy + # ---------------------------------------------------- + my $mysqlhotcopy= + mtr_pl_maybe_exists("$basedir/scripts/mysqlhotcopy"); + # Since mysqltest interprets the real path as "false" in an if, + # use 1 ("true") to indicate "not exists" so it can be tested for + $ENV{'MYSQLHOTCOPY'}= $mysqlhotcopy || 1; + + # ---------------------------------------------------- # perror # ---------------------------------------------------- my $exe_perror= mtr_exe_exists(vs_config_dirs('extra', 'perror'), |