Commit 89780a84 authored by msvensson@pilot.(none)'s avatar msvensson@pilot.(none)
Browse files

Remove unsued variable $glob_hostname, unused functions 

'mtr_short_hostname' and 'mtr_full_hostname'
parent 643ce397

mysql-test/lib/mtr_misc.pl

+0 −26
Original line number Diff line number Diff line
@@ -20,8 +20,6 @@ 


use strict;



sub mtr_full_hostname ();

sub mtr_short_hostname ();

sub mtr_native_path($);

sub mtr_init_args ($);

sub mtr_add_arg ($$@);
@@ -40,30 +38,6 @@ sub mtr_cmp_opts($$); 
#

##############################################################################



# 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 () {



  my $hostname=  hostname();

  if ( $hostname !~ /\./ )

  {

    my $address=   gethostbyname($hostname)

      or mtr_error("Couldn't resolve $hostname : $!");

    my $fullname=  gethostbyaddr($address, AF_INET);

    $hostname= $fullname if $fullname; 

  }

  return $hostname;

}



sub mtr_short_hostname () {



  my $hostname=  hostname();

  $hostname =~ s/\..+$//;

  return $hostname;

}



# Convert path to OS native format

sub mtr_native_path($)

{

mysql-test/mysql-test-run.pl

+4 −4
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ use File::Copy; 
use File::Temp qw / tempdir /;

use Cwd;

use Getopt::Long;

use Sys::Hostname;

use IO::Socket;

use IO::Socket::INET;

use strict;
@@ -100,7 +99,6 @@ $Devel::Trace::TRACE= 1; 
our $mysql_version_id;

our $glob_mysql_test_dir=         undef;

our $glob_mysql_bench_dir=        undef;

our $glob_hostname=               undef;

our $glob_scriptname=             undef;

our $glob_timers=                 undef;

our $glob_use_running_ndbcluster= 0;
@@ -647,8 +645,6 @@ sub command_line_setup () { 
    $source_dist=  1;

  }



  $glob_hostname=  mtr_short_hostname();



  # Find the absolute path to the test directory

  $glob_mysql_test_dir=  cwd();

  if ( $glob_cygwin_perl )
@@ -3063,11 +3059,15 @@ sub install_db ($$) { 
  mtr_appendfile_to_file("$path_sql_dir/fill_help_tables.sql",

			 $bootstrap_sql_file);



  mtr_tofile($bootstrap_sql_file,

	     "DELETE FROM mysql.user where user= '';");



  # Log bootstrap command

  my $path_bootstrap_log= "$opt_vardir/log/bootstrap.log";

  mtr_tofile($path_bootstrap_log,

	     "$exe_mysqld_bootstrap " . join(" ", @$args) . "\n");





  if ( mtr_run($exe_mysqld_bootstrap, $args, $bootstrap_sql_file,

               $path_bootstrap_log, $path_bootstrap_log,

	       "", { append_log_file => 1 }) != 0 )