bk commit into 4.1 tree (kent:1.2383) BUG#12615

[kent]

Below is the list of changes that have just been committed into a local
4.1 repository of kent. When kent does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2383 05/08/17 14:40:23 kent@stripped +2 -0
  mysql-test-run.pl, mtr_misc.pl:
    Bug#12615: Host name might not resolve, use short host name

  mysql-test/mysql-test-run.pl
    1.37 05/08/17 14:39:47 kent@stripped +1 -1
    Bug#12615: Host name might not resolve, use short host name

  mysql-test/lib/mtr_misc.pl
    1.5 05/08/17 14:39:47 kent@stripped +9 -0
    Bug#12615: Host name might not resolve, use short host name

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	kent
# Host:	dialup-d2i-62-65-89-17.home.se
# Root:	/Users/kent/mysql/bk/mysql-4.1-release

--- 1.4/mysql-test/lib/mtr_misc.pl	2005-07-06 22:18:12 +02:00
+++ 1.5/mysql-test/lib/mtr_misc.pl	2005-08-17 14:39:47 +02:00
@@ -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 @@
 
 # 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 () {
 
@@ -32,6 +34,13 @@
     my $fullname=  gethostbyaddr($address, AF_INET);
     $hostname= $fullname if $fullname; 
   }
+  return $hostname;
+}
+
+sub mtr_short_hostname () {
+
+  my $hostname=  hostname();
+  $hostname =~ s/\..+$//;
   return $hostname;
 }
 

--- 1.36/mysql-test/mysql-test-run.pl	2005-08-17 03:32:17 +02:00
+++ 1.37/mysql-test/mysql-test-run.pl	2005-08-17 14:39:47 +02:00
@@ -414,7 +414,7 @@
     $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();