diff options
| author | John H. Embretsen <john.embretsen@oracle.com> | 2011-01-14 14:50:39 +0100 |
|---|---|---|
| committer | John H. Embretsen <john.embretsen@oracle.com> | 2011-01-14 14:50:39 +0100 |
| commit | eb85bdfa6d9537f5adea1f6bd048d4ff1b7d2a94 (patch) | |
| tree | 750c87298a701894b35c851e3bd31eb0ade39b03 /mysql-test/mysql-test-run.pl | |
| parent | faafae781adc87d80dc0e7c5e631996ed015f8ed (diff) | |
| download | mariadb-git-eb85bdfa6d9537f5adea1f6bd048d4ff1b7d2a94.tar.gz | |
Bug#56895 part 1 of 2: Backport of revid holyfoot@mysql.com-20100823084827-js10vjuil88je35r from mysql-5.5.
The purpose is to make MTR logic for mysqlhotcopy the same in 5.1 as in 5.5, making it easier to maintain and fix bugs such as 56817.
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index e10c1116f2c..d9dd9d48299 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -2145,7 +2145,10 @@ sub environment_setup { 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; + if ($mysqlhotcopy) + { + $ENV{'MYSQLHOTCOPY'}= $mysqlhotcopy; + } # ---------------------------------------------------- # perror |