List:Commits« Previous MessageNext Message »
From:msvensson Date:August 24 2007 1:43pm
Subject:bk commit into 5.0 tree (msvensson:1.2500)
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson 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@stripped, 2007-08-24 15:43:45+02:00, msvensson@pilot.(none) +2 -0
  Remove unsued variable $glob_hostname, unused functions
  'mtr_short_hostname' and 'mtr_full_hostname'

  mysql-test/lib/mtr_misc.pl@stripped, 2007-08-24 15:43:44+02:00, msvensson@pilot.(none) +0 -26
    Remove unsued variable $glob_hostname, unused functions
    'mtr_short_hostname' and 'mtr_full_hostname'

  mysql-test/mysql-test-run.pl@stripped, 2007-08-24 15:43:44+02:00, msvensson@pilot.(none) +4 -4
    Remove unsued variable $glob_hostname, unused functions
    'mtr_short_hostname' and 'mtr_full_hostname'

diff -Nrup a/mysql-test/lib/mtr_misc.pl b/mysql-test/lib/mtr_misc.pl
--- a/mysql-test/lib/mtr_misc.pl	2007-03-01 19:10:05 +01:00
+++ b/mysql-test/lib/mtr_misc.pl	2007-08-24 15:43:44 +02:00
@@ -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 ($$@);
@@ -39,30 +37,6 @@ sub mtr_cmp_opts($$);
 #  Misc
 #
 ##############################################################################
-
-# 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 -Nrup a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
--- a/mysql-test/mysql-test-run.pl	2007-08-20 13:46:55 +02:00
+++ b/mysql-test/mysql-test-run.pl	2007-08-24 15:43:44 +02:00
@@ -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,10 +3059,14 @@ 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,
Thread
bk commit into 5.0 tree (msvensson:1.2500)msvensson24 Aug