diff options
| author | Kent Boortz <kent.boortz@oracle.com> | 2014-02-03 16:04:44 +0100 |
|---|---|---|
| committer | Kent Boortz <kent.boortz@oracle.com> | 2014-02-03 16:04:44 +0100 |
| commit | 88ae49a401fdc2d56742fa89d255b50fd03bf693 (patch) | |
| tree | f5ab50222fabb152ec16befb177625d8bdf7f5d7 /scripts | |
| parent | 1db027f34865646e53e40d9282616e02099f6bf7 (diff) | |
| download | mariadb-git-88ae49a401fdc2d56742fa89d255b50fd03bf693.tar.gz | |
Bug#11751526 / Bug#42421 - MYSQL_INSTALL_DB.PL NOT RELOCATABLE ON WINDOWS
Corrected how to find "resolveip"
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mysql_install_db.pl.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/mysql_install_db.pl.in b/scripts/mysql_install_db.pl.in index 9d908c850c5..da097120f10 100644 --- a/scripts/mysql_install_db.pl.in +++ b/scripts/mysql_install_db.pl.in @@ -365,7 +365,7 @@ my $hostname = hostname(); my $resolved; if ( !$opt->{'cross-bootstrap'} and !$opt->{rpm} and !$opt->{force} ) { - my $resolveip; + my $resolveip = "$extra_bindir/resolveip"; $resolved = `$resolveip $hostname 2>&1`; if ( $? != 0 ) @@ -375,14 +375,14 @@ if ( !$opt->{'cross-bootstrap'} and !$opt->{rpm} and !$opt->{force} ) { error($opt, "Neither host '$hostname' nor 'localhost' could be looked up with", - "$bindir/resolveip", + "$resolveip", "Please configure the 'hostname' command to return a correct", "hostname.", "If you want to solve this at a later stage, restart this script", "with the --force option"); } 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", "with this binary MySQL version. The MySQL daemon, mysqld, should work", "normally with the exception that host name resolving will not work.", |