diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-03-27 22:26:58 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-03-27 22:26:58 +0100 |
| commit | cb67dcb6184535349ca4ff3d7c64eba9c63a0688 (patch) | |
| tree | 10d38ccf7fe60d5ea5c866d37292833b77dfcdae /scripts/mysql_install_db.pl.in | |
| parent | 44002a34e680c79c01df879b540458c2885e97e8 (diff) | |
| parent | faec0e2f4aecfc902e354ae7af991779d6bfc4a7 (diff) | |
| download | mariadb-git-cb67dcb6184535349ca4ff3d7c64eba9c63a0688.tar.gz | |
mysql-5.5.37 selective 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 3903140b227..433a412b115 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.", |