From eb85bdfa6d9537f5adea1f6bd048d4ff1b7d2a94 Mon Sep 17 00:00:00 2001
From: "John H. Embretsen" <john.embretsen@oracle.com>
Date: Fri, 14 Jan 2011 14:50:39 +0100
Subject: [PATCH] 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.

---
 mysql-test/include/mysqlhotcopy.inc | 2 +-
 mysql-test/mysql-test-run.pl        | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/mysql-test/include/mysqlhotcopy.inc b/mysql-test/include/mysqlhotcopy.inc
index b3fd5e47179..91e0eff1e0f 100644
--- a/mysql-test/include/mysqlhotcopy.inc
+++ b/mysql-test/include/mysqlhotcopy.inc
@@ -5,7 +5,7 @@
 --source include/not_windows.inc
 --source include/not_embedded.inc
 
-if ($MYSQLHOTCOPY)
+if (!$MYSQLHOTCOPY)
 {
   die due to missing mysqlhotcopy tool;
 }
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