summaryrefslogtreecommitdiff
path: root/scripts/mysql_install_db.sh
diff options
context:
space:
mode:
authortim@localhost.polyesthetic.msg <>2000-08-09 14:57:59 -0400
committertim@localhost.polyesthetic.msg <>2000-08-09 14:57:59 -0400
commit621c7db2f7162bf6a7ba8ef92010c652524654b9 (patch)
treea0cf94f2d293550153a190978809da6b5e8220cc /scripts/mysql_install_db.sh
parentc6c775c982a76a9829d384fee6d5adc599a235d7 (diff)
downloadmariadb-git-621c7db2f7162bf6a7ba8ef92010c652524654b9.tar.gz
Use @HOSTNAME@ instead of hardcoded /bin/hostname.
Diffstat (limited to 'scripts/mysql_install_db.sh')
-rw-r--r--scripts/mysql_install_db.sh6
1 files changed, 2 insertions, 4 deletions
diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
index 9cd4af94042..ce6f7155b05 100644
--- a/scripts/mysql_install_db.sh
+++ b/scripts/mysql_install_db.sh
@@ -77,9 +77,7 @@ then
fi
fi
-# On IRIX hostname is in /usr/bsd so add this to the path
-PATH=$PATH:/usr/bsd
-hostname=`hostname` # Install this too in the user table
+hostname=`@HOSTNAME@` # Install this too in the user table
# Check if hostname is valid
if test "$IN_RPM" -eq 0 -a $force -eq 0
@@ -287,7 +285,7 @@ then
echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !"
echo "This is done with:"
echo "$bindir/mysqladmin -u root -p password 'new-password'"
- echo "$bindir/mysqladmin -u root -h `hostname` -p password 'new-password'"
+ echo "$bindir/mysqladmin -u root -h $hostname -p password 'new-password'"
echo "See the manual for more instructions."
#
# Print message about upgrading unless we have created a new db table.