database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Remove unsued variable $glob_hostname, unused functions

Browse Source 
'mtr_short_hostname' and 'mtr_full_hostname'
This commit is contained in:
unknown
2007-08-24 15:43:45 +02:00
parent 6ba1e8a039
commit b18447112c
2 changed files with 4 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
mysql-test/lib/mtr_misc.pl
View File

@ -20,8 +20,6 @@
use strict; use strict;
sub mtr_full_hostname ();
sub mtr_short_hostname ();
sub mtr_native_path($); sub mtr_native_path($);
sub mtr_init_args ($); sub mtr_init_args ($);
sub mtr_add_arg ($$@); 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 # Convert path to OS native format
sub mtr_native_path($) sub mtr_native_path($)
{ {

8
mysql-test/mysql-test-run.pl
View File

@ -61,7 +61,6 @@ use File::Copy;
use File::Temp qw / tempdir /; use File::Temp qw / tempdir /;
use Cwd; use Cwd;
use Getopt::Long; use Getopt::Long;
use Sys::Hostname;
use IO::Socket; use IO::Socket;
use IO::Socket::INET; use IO::Socket::INET;
use strict; use strict;
@ -100,7 +99,6 @@ $Devel::Trace::TRACE= 1;
our $mysql_version_id; our $mysql_version_id;
our $glob_mysql_test_dir= undef; our $glob_mysql_test_dir= undef;
our $glob_mysql_bench_dir= undef; our $glob_mysql_bench_dir= undef;
our $glob_hostname= undef;
our $glob_scriptname= undef; our $glob_scriptname= undef;
our $glob_timers= undef; our $glob_timers= undef;
our $glob_use_running_ndbcluster= 0; our $glob_use_running_ndbcluster= 0;
@ -647,8 +645,6 @@ sub command_line_setup () {
$source_dist= 1; $source_dist= 1;
} }
$glob_hostname= mtr_short_hostname();
# Find the absolute path to the test directory # Find the absolute path to the test directory
$glob_mysql_test_dir= cwd(); $glob_mysql_test_dir= cwd();
if ( $glob_cygwin_perl ) if ( $glob_cygwin_perl )
@ -3063,11 +3059,15 @@ sub install_db ($$) {
mtr_appendfile_to_file("$path_sql_dir/fill_help_tables.sql", mtr_appendfile_to_file("$path_sql_dir/fill_help_tables.sql",
$bootstrap_sql_file); $bootstrap_sql_file);
mtr_tofile($bootstrap_sql_file,
"DELETE FROM mysql.user where user= '';");
# Log bootstrap command # Log bootstrap command
my $path_bootstrap_log= "$opt_vardir/log/bootstrap.log"; my $path_bootstrap_log= "$opt_vardir/log/bootstrap.log";
mtr_tofile($path_bootstrap_log, mtr_tofile($path_bootstrap_log,
"$exe_mysqld_bootstrap " . join(" ", @$args) . "\n"); "$exe_mysqld_bootstrap " . join(" ", @$args) . "\n");
if ( mtr_run($exe_mysqld_bootstrap, $args, $bootstrap_sql_file, if ( mtr_run($exe_mysqld_bootstrap, $args, $bootstrap_sql_file,
$path_bootstrap_log, $path_bootstrap_log, $path_bootstrap_log, $path_bootstrap_log,
"", { append_log_file => 1 }) != 0 ) "", { append_log_file => 1 }) != 0 )