Commit 88ae49a4 authored by Kent Boortz's avatar Kent Boortz

Bug#11751526 / Bug#42421 - MYSQL_INSTALL_DB.PL NOT RELOCATABLE ON WINDOWS

  Corrected how to find "resolveip"
parent 1db027f3
...@@ -365,7 +365,7 @@ my $hostname = hostname(); ...@@ -365,7 +365,7 @@ my $hostname = hostname();
my $resolved; my $resolved;
if ( !$opt->{'cross-bootstrap'} and !$opt->{rpm} and !$opt->{force} ) if ( !$opt->{'cross-bootstrap'} and !$opt->{rpm} and !$opt->{force} )
{ {
my $resolveip; my $resolveip = "$extra_bindir/resolveip";
$resolved = `$resolveip $hostname 2>&1`; $resolved = `$resolveip $hostname 2>&1`;
if ( $? != 0 ) if ( $? != 0 )
...@@ -375,14 +375,14 @@ if ( !$opt->{'cross-bootstrap'} and !$opt->{rpm} and !$opt->{force} ) ...@@ -375,14 +375,14 @@ if ( !$opt->{'cross-bootstrap'} and !$opt->{rpm} and !$opt->{force} )
{ {
error($opt, error($opt,
"Neither host '$hostname' nor 'localhost' could be looked up with", "Neither host '$hostname' nor 'localhost' could be looked up with",
"$bindir/resolveip", "$resolveip",
"Please configure the 'hostname' command to return a correct", "Please configure the 'hostname' command to return a correct",
"hostname.", "hostname.",
"If you want to solve this at a later stage, restart this script", "If you want to solve this at a later stage, restart this script",
"with the --force option"); "with the --force option");
} }
warning($opt, warning($opt,
"The host '$hostname' could not be looked up with resolveip.", "The host '$hostname' could not be looked up with $resolveip.",
"This probably means that your libc libraries are not 100 % compatible", "This probably means that your libc libraries are not 100 % compatible",
"with this binary MySQL version. The MySQL daemon, mysqld, should work", "with this binary MySQL version. The MySQL daemon, mysqld, should work",
"normally with the exception that host name resolving will not work.", "normally with the exception that host name resolving will not work.",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment