bzr commit into mysql-5.1 branch (john.embretsen:3553) Bug#56895

[John H. Embretsen]

#At file:///export/home/tmp/je159969/mysql-dev/bzr-repos/mysql-5.1-bug56895/ based on revid:john.embretsen@stripped

 3553 John H. Embretsen	2011-01-14
      Bug#56895 part 2 of 2: Backport of revid holyfoot@stripped 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.

    modified:
      mysql-test/mysql-test-run.pl
=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2011-01-14 13:50:39 +0000
+++ b/mysql-test/mysql-test-run.pl	2011-01-14 14:03:15 +0000
@@ -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("$bindir/scripts/mysqlhotcopy") ||
+    mtr_pl_maybe_exists("$path_client_bindir/mysqlhotcopy");
   if ($mysqlhotcopy)
   {
     $ENV{'MYSQLHOTCOPY'}= $mysqlhotcopy;


Attachment: [text/bzr-bundle] bzr/[e-mail]