Merge

mysql-test/lib/mtr_misc.pl

@@ -83,18 +83,19 @@ sub mtr_script_exists (@) {
 }
 
 sub mtr_exe_exists (@) {
-  foreach my $path ( @_ )
+  my @path= @_;
+  map {$_.= ".exe"} @path if $::glob_win32;
+  foreach my $path ( @path )
   {
-    $path.= ".exe" if $::opt_win32;
     return $path if -x $path;
   }
-  if ( @_ == 1 )
+  if ( @path == 1 )
   {
-    mtr_error("Could not find $_[0]");
+    mtr_error("Could not find $path[0]");
   }
   else
   {
-    mtr_error("Could not find any of " . join(" ", @_));
+    mtr_error("Could not find any of " . join(" ", @path));
   }
 }
 

mysql-test/mysql-test-run.pl

@@ -792,13 +792,15 @@ sub executable_setup () {
       my $path_examples= "$glob_basedir/libmysqld/examples";
       $exe_mysqltest=    mtr_exe_exists("$path_examples/mysqltest");
       $exe_mysql_client_test=
-        mtr_exe_exists("$path_examples/mysql_client_test_embedded");
+        mtr_exe_exists("$path_examples/mysql_client_test_embedded",
+		       "/usr/bin/false");
     }
     else
     {
       $exe_mysqltest=  mtr_exe_exists("$path_client_bindir/mysqltest");
       $exe_mysql_client_test=
-        mtr_exe_exists("$glob_basedir/tests/mysql_client_test");
+        mtr_exe_exists("$glob_basedir/tests/mysql_client_test",
+		       "/usr/bin/false");
     }
     $exe_mysqldump=      mtr_exe_exists("$path_client_bindir/mysqldump");
     $exe_mysqlshow=      mtr_exe_exists("$path_client_bindir/mysqlshow");
@@ -820,7 +822,8 @@ sub executable_setup () {
     $exe_mysqladmin=     mtr_exe_exists("$path_client_bindir/mysqladmin");
     $exe_mysql=          mtr_exe_exists("$path_client_bindir/mysql");
     $exe_mysql_fix_system_tables=
-      mtr_script_exists("$path_client_bindir/mysql_fix_privilege_tables");
+      mtr_script_exists("$path_client_bindir/mysql_fix_privilege_tables",
+			"$glob_basedir/scripts/mysql_fix_privilege_tables");
 
     $path_language=      mtr_path_exists("$glob_basedir/share/mysql/english/",
                                          "$glob_basedir/share/english/");
@@ -834,13 +837,15 @@ sub executable_setup () {
       $exe_mysqltest= mtr_exe_exists("$path_client_bindir/mysqltest_embedded");
       $exe_mysql_client_test=
         mtr_exe_exists("$glob_basedir/tests/mysql_client_test_embedded",
-                       "$path_client_bindir/mysql_client_test_embedded");
+                       "$path_client_bindir/mysql_client_test_embedded",
+		       "/usr/bin/false");
     }
     else
     {
       $exe_mysqltest= mtr_exe_exists("$path_client_bindir/mysqltest");
       $exe_mysql_client_test=
-        mtr_exe_exists("$path_client_bindir/mysql_client_test");
+        mtr_exe_exists("$path_client_bindir/mysql_client_test",
+		       "/usr/bin/false"); # FIXME temporary
     }
 
     $path_ndb_tools_dir=  "$glob_basedir/bin";
@@ -1549,7 +1554,7 @@ sub do_before_start_master ($$) {
        $tname ne "rpl_crash_binlog_ib_3b")
   {
     # FIXME we really want separate dir for binlogs
-    foreach my $bin ( glob("$opt_vardir/log/master*-bin.*") )
+    foreach my $bin ( glob("$opt_vardir/log/master*-bin*") )
     {
       unlink($bin);
     }
@@ -1587,13 +1592,13 @@ sub do_before_start_slave ($$) {
        $tname ne "rpl_crash_binlog_ib_3b" )
   {
     # FIXME we really want separate dir for binlogs
-    foreach my $bin ( glob("$opt_vardir/log/slave*-bin.*") )
+    foreach my $bin ( glob("$opt_vardir/log/slave*-bin*") )
     {
       unlink($bin);
     }
     # FIXME really master?!
-    unlink("$opt_vardir/slave-data/master.info");
-    unlink("$opt_vardir/slave-data/relay-log.info");
+    unlink("$slave->[0]->{'path_myddir'}/master.info");
+    unlink("$slave->[0]->{'path_myddir'}/relay-log.info");
   }
 
   # Run slave initialization shell script if one exists
@@ -1607,8 +1612,10 @@ sub do_before_start_slave ($$) {
     }
   }
 
-  `rm -f $opt_vardir/slave-data/log.*`;
-#  unlink("$opt_vardir/slave-data/log.*");
+  foreach my $bin ( glob("$slave->[0]->{'path_myddir'}/log.*") )
+  {
+    unlink($bin);
+  }
 }
 
 sub mysqld_arguments ($$$$$) {