Commit a04d3827 authored by unknown's avatar unknown

Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_vs_config/my50-mtr_vs_config

into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Auto merged
parents fef32d41 75bde223
......@@ -66,6 +66,9 @@ sub mtr_add_arg ($$@) {
##############################################################################
# Note - More specific paths should be given before less specific. For examle
# /client/debug should be listed before /client
sub mtr_path_exists (@) {
foreach my $path ( @_ )
{
......@@ -81,6 +84,9 @@ sub mtr_path_exists (@) {
}
}
# Note - More specific paths should be given before less specific. For examle
# /client/debug should be listed before /client
sub mtr_script_exists (@) {
foreach my $path ( @_ )
{
......@@ -111,6 +117,20 @@ sub mtr_file_exists (@) {
return "";
}
# Note - More specific paths should be given before less specific. For examle
# /client/debug should be listed before /client
sub mtr_file_exists (@) {
foreach my $path ( @_ )
{
return $path if -e $path;
}
return "";
}
# Note - More specific paths should be given before less specific. For examle
# /client/debug should be listed before /client
sub mtr_exe_maybe_exists (@) {
my @path= @_;
......@@ -129,6 +149,9 @@ sub mtr_exe_maybe_exists (@) {
return "";
}
# Note - More specific paths should be given before less specific. For examle
# /client/debug should be listed before /client
sub mtr_exe_exists (@) {
my @path= @_;
if (my $path= mtr_exe_maybe_exists(@path))
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment