From c83ff21e9b177077ab4cbea41e3b61b30b6fa4ce Mon Sep 17 00:00:00 2001
From: Alexey Botchkov <holyfoot@mysql.com>
Date: Mon, 23 Aug 2010 13:48:27 +0500
Subject: [PATCH] mysqlhotcopy tests fixed. The include/mysqlhotcopy.inc had an
 error in the 'if' condition, so it failed if the mysqlhotcopy tool was found.

per-file comments:
  mysql-test/include/mysqlhotcopy.inc
        test should proceed exactly if the mysqlhotcopy was set.
  mysql-test/mysql-test-run.pl
        don't set the MYSQL_HOTCOPY variable if no mysqlhotcopy was found.
---
 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 03d0c9eb621..1b965e7079d 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -2158,7 +2158,10 @@ sub environment_setup {
     mtr_pl_maybe_exists("$bindir/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