diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-05-09 12:35:11 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-05-09 12:35:11 +0200 |
| commit | d3e2e1243bb0dae95ce35b0380dd4f8f476b254d (patch) | |
| tree | 8779ad6b2059f181770cc07e2437925d7d5d5d04 /scripts/mysql_install_db.pl.in | |
| parent | 229dad1f9b12f8e9f64b6a605bdf8e31c339d018 (diff) | |
| parent | 124428a9e28e59f98b25d8ee07b57d264f63cbe4 (diff) | |
| download | mariadb-git-d3e2e1243bb0dae95ce35b0380dd4f8f476b254d.tar.gz | |
5.5 merge
Diffstat (limited to 'scripts/mysql_install_db.pl.in')
| -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 e63e8646d07..40dc275a29c 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 = $bindir/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.", |