diff options
| author | unknown <lenz@mysql.com> | 2003-08-26 14:29:13 +0200 |
|---|---|---|
| committer | unknown <lenz@mysql.com> | 2003-08-26 14:29:13 +0200 |
| commit | d11680b9c940f9d6d0a2acb7133b4723f06a2ebd (patch) | |
| tree | ae678bec01929c11461ea24c822be4c15a379b46 | |
| parent | cb692da4a347b2c19c388ec779a49a9ac6f534a9 (diff) | |
| download | mariadb-git-d11680b9c940f9d6d0a2acb7133b4723f06a2ebd.tar.gz | |
- Reverted a fix for bug#897, as it broke the installation on some
other operating systems - some implementations of "hostname" simply set
the host name to "-f" instead of giving an error about an unkown option
| -rw-r--r-- | scripts/mysql_install_db.sh | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh index ffb857933cd..920bd27cc88 100644 --- a/scripts/mysql_install_db.sh +++ b/scripts/mysql_install_db.sh @@ -107,13 +107,8 @@ then fi fi -# Try to determine the fully qualified domain name (FQDN) -HOSTNAME="@HOSTNAME@" -if $HOSTNAME -f > /dev/null 2>&1 ; then - hostname=`$HOSTNAME -f` -else - hostname=`$HOSTNAME` -fi +# Try to determine the hostname +hostname=`@HOSTNAME@` # Check if hostname is valid if test "$IN_RPM" -eq 0 -a $force -eq 0 |