2 files changed, 10 insertions, 1 deletions
diff --git a/mysql-test/lib/mtr_misc.pl b/mysql-test/lib/mtr_misc.pl
index c1aab340a16..9a12d842998 100644
--- a/mysql-test/lib/mtr_misc.pl
+++ b/mysql-test/lib/mtr_misc.pl
@@ -7,6 +7,7 @@
 use strict;
 
 sub mtr_full_hostname ();
+sub mtr_short_hostname ();
 sub mtr_init_args ($);
 sub mtr_add_arg ($$);
 sub mtr_path_exists(@);
@@ -21,6 +22,7 @@ sub mtr_exe_exists(@);
 
 # We want the fully qualified host name and hostname() may have returned
 # only the short name. So we use the resolver to find out.
+# Note that this might fail on some platforms
 
 sub mtr_full_hostname () {
 
@@ -35,6 +37,13 @@ sub mtr_full_hostname () {
   return $hostname;
 }
 
+sub mtr_short_hostname () {
+
+  my $hostname=  hostname();
+  $hostname =~ s/\..+$//;
+  return $hostname;
+}
+
 # FIXME move to own lib
 
 sub mtr_init_args ($) {
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index e976242e726..f3e42ecf755 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -414,7 +414,7 @@ sub initial_setup () {
     $opt_source_dist=  1;
   }
 
-  $glob_hostname=  mtr_full_hostname();
+  $glob_hostname=  mtr_short_hostname();
 
   # 'basedir' is always parent of "mysql-test" directory
   $glob_mysql_test_dir=  cwd();