merge of patch for bug#52913 from 5.1-bugteam to trunk-bugfixing. Changed...

merge of patch for bug#52913 from 5.1-bugteam to trunk-bugfixing. Changed $basedir to $bindir in mysql-test-run.pl.

mysql-test/include/mysqlhotcopy.inc

@@ -5,6 +5,11 @@
 --source include/not_windows.inc
 --source include/not_embedded.inc
 
+if ($MYSQLHOTCOPY)
+{
+  die due to missing mysqlhotcopy tool;
+}
+
 let $MYSQLD_DATADIR= `SELECT @@datadir`;
 --disable_warnings
 DROP DATABASE IF EXISTS hotcopy_test;

mysql-test/mysql-test-run.pl

@@ -2114,7 +2114,7 @@ sub environment_setup {
   # mysqlhotcopy
   # ----------------------------------------------------
   my $mysqlhotcopy=
-    mtr_pl_maybe_exists("$basedir/scripts/mysqlhotcopy");
+    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;

mysql-test/t/disabled.def

@@ -13,3 +13,5 @@ kill                     : Bug#37780 2008-12-03 HHunger need some changes to be
 query_cache_28249        : Bug#43861 2009-03-25 main.query_cache_28249 fails sporadically
 sp_sync                  : Bug#48157 2010-02-06 5.5-m3 demands a differnt solution
 plugin_load              : Bug#42144 2009-12-21 alik plugin_load fails
+mysqlhotcopy_myisam      : bug#54129 2010-06-04 Horst
+mysqlhotcopy_archive     : bug#54129 2010-06-04 Horst