summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorserg@serg.mylan <>2004-07-29 23:39:51 +0200
committerserg@serg.mylan <>2004-07-29 23:39:51 +0200
commit0c3109fc68285ca772997e24621be0f2a8f5266f (patch)
tree260b286a25b6f43585acf7e548abdba756c5ea2d
parentf76b84979de6db9f6a79e79bc34f8dff9c982a92 (diff)
parent0d0a50ce6a2743a1ec5806e8535d5b4e0b4efe99 (diff)
downloadmariadb-git-0c3109fc68285ca772997e24621be0f2a8f5266f.tar.gz
Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
-rw-r--r--scripts/mysql_install_db.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
index 7ab312baa5c..f9f3160d220 100644
--- a/scripts/mysql_install_db.sh
+++ b/scripts/mysql_install_db.sh
@@ -143,7 +143,7 @@ then
resolved=`$bindir/resolveip localhost 2>&1`
if [ $? -ne 0 ]
then
- echo "Neither host '$hostname' and 'localhost' could not be looked up with"
+ echo "Neither host '$hostname' nor 'localhost' could not be looked up with"
echo "$bindir/resolveip"
echo "Please configure the 'hostname' command to return a correct hostname."
echo "If you want to solve this at a later stage, restart this script with"