diff options
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/lib/mtr_misc.pl | 26 | ||||
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 8 |
2 files changed, 4 insertions, 30 deletions
diff --git a/mysql-test/lib/mtr_misc.pl b/mysql-test/lib/mtr_misc.pl index dc22f88bd7f..e54cb326ade 100644 --- a/mysql-test/lib/mtr_misc.pl +++ b/mysql-test/lib/mtr_misc.pl @@ -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($) { diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 74dd14c550f..3830f5f3ec9 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -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_embedded_server= 0; @@ -646,8 +644,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 ) @@ -3086,11 +3082,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 ) |