diff options
| author | John H. Embretsen <john.embretsen@oracle.com> | 2011-01-14 17:01:13 +0100 |
|---|---|---|
| committer | John H. Embretsen <john.embretsen@oracle.com> | 2011-01-14 17:01:13 +0100 |
| commit | 4a62ee2c95e93b2a985aef44ca4fb78cd941b1de (patch) | |
| tree | cf839bd1b9a097f1bc8f1415181d0fd67c123f84 /mysql-test/mysql-test-run.pl | |
| parent | dc7289128d7bc3a454cf838cff7b2ef771652c75 (diff) | |
| download | mariadb-git-4a62ee2c95e93b2a985aef44ca4fb78cd941b1de.tar.gz | |
Bug#56895 part 2 of 2: Backport of revid holyfoot@mysql.com-20100825135522-8wrjjmvh2u2t0qo6 from mysql-5.5.
Without this patch mysqlhotcopy tests would fail due to not finding the mysqlhotcopy tool in release-like builds.
With this patch the tests would either pass, or fail due to missing Perl modules (see 56817).
Text conflict in mysql-test/mysql-test-run.pl:
- resolved by using logic from 5.5 to find mysqlhotcopy, the intention of this backport. Changed bindir to basedir.
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index d9dd9d48299..a8a05ee730d 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -2142,9 +2142,8 @@ sub environment_setup { # 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 + mtr_pl_maybe_exists("$basedir/scripts/mysqlhotcopy") || + mtr_pl_maybe_exists("$path_client_bindir/mysqlhotcopy"); if ($mysqlhotcopy) { $ENV{'MYSQLHOTCOPY'}= $mysqlhotcopy; |