summaryrefslogtreecommitdiff
path: root/scripts/mysql_install_db.sh
diff options
context:
space:
mode:
authorunknown <monty@donna.mysql.com>2000-09-07 23:58:43 +0300
committerunknown <monty@donna.mysql.com>2000-09-07 23:58:43 +0300
commite9505769a22116d60848a33d6e869e5ec138aa3a (patch)
tree10e56364ce6757d09940fcf5af704e48484c9b00 /scripts/mysql_install_db.sh
parent2b3ed20204fce6f5a972bfe6bf2aac2fffba8f73 (diff)
downloadmariadb-git-e9505769a22116d60848a33d6e869e5ec138aa3a.tar.gz
Small portability fixes
Docs/manual.texi: Portability updates, user addition and changelog for 3.23.24 mysys/thr_rwlock.c: Portability fix scripts/make_binary_distribution.sh: Added use of sbindir scripts/mysql_install_db.sh: Fixed usage of defaults files sql/ha_myisam.cc: Cleanup sql/sql_base.cc: Cleanup
Diffstat (limited to 'scripts/mysql_install_db.sh')
-rw-r--r--scripts/mysql_install_db.sh16
1 files changed, 9 insertions, 7 deletions
diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
index 50d147c1ade..f166b996edf 100644
--- a/scripts/mysql_install_db.sh
+++ b/scripts/mysql_install_db.sh
@@ -25,11 +25,11 @@ do
;;
--force) force=1
;;
- --no-defaults=*) CONFIG_FILES=/nonexistent
+ --no-defaults=*) defaults="$1"; CONFIG_FILES=/nonexistent
;;
- --defaults-file=*) CONFIG_FILES="$eqvalue"
+ --defaults-file=*) defaults="$1"; CONFIG_FILES="$eqvalue"
;;
- --basedir=*) SETVARS="$SETVARS basedir=\"$eqvalue\"; bindir=\"$eqvalue/bon\"; execdir=\"$eqvalue/libexec\"; sbindir=\"$eqvalue/sbin\"; "
+ --basedir=*) SETVARS="$SETVARS basedir=\"$eqvalue\"; bindir=\"$eqvalue/bin\"; execdir=\"$eqvalue/libexec\"; sbindir=\"$eqvalue/sbin\"; "
;;
--ldata=*|--datadir=*) SETVARS="$SETVARS ldata=\"$eqvalue\";"
;;
@@ -120,10 +120,12 @@ then
echo "the --force option"
exit 1
fi
- echo "WARNING: Your libc libraries are not 100 % compatible with this MySQL version"
- echo "mysqld should work normally with the exception that host name resolving"
- echo "will not work. This means that you should use IP addresses instead"
- echo "of hostnames when specifying MySQL privileges !"
+ echo "WARNING: The host '$hostname' could not be looked up with resolveip."
+ echo "This probably means that your libc libraries are not 100 % compatible"
+ echo "with this binary MySQL version. The MySQL deamon, mysqld, should work"
+ echo "normally with the exception that host name resolving will not work."
+ echo "This means that you should use IP addresses instead of hostnames"
+ echo "when specifying MySQL privileges !"
fi
fi