diff options
| author | unknown <jcole@ham.spaceapes.com> | 2000-09-07 20:59:06 +0000 |
|---|---|---|
| committer | unknown <jcole@ham.spaceapes.com> | 2000-09-07 20:59:06 +0000 |
| commit | e94111e4e8f482959ceb571a9208dd1716385f10 (patch) | |
| tree | 42a4ea1db98f0fcd5411c91592b3a907daf130e0 /scripts | |
| parent | 4aec929ca08edb8f9ce57eb210d3da78e344f5e8 (diff) | |
| parent | 55deb559c5012d2c1214adaf17afc202d7ea7861 (diff) | |
| download | mariadb-git-e94111e4e8f482959ceb571a9208dd1716385f10.tar.gz | |
Merge jcole@work.mysql.com:/home/bk/mysql
into ham.spaceapes.com:/usr/home/jcole/bk/mysql
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/make_binary_distribution.sh | 2 | ||||
| -rw-r--r-- | scripts/mysql_install_db.sh | 16 |
2 files changed, 10 insertions, 8 deletions
diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh index 8318ae3d696..4bb981aba14 100755 --- a/scripts/make_binary_distribution.sh +++ b/scripts/make_binary_distribution.sh @@ -54,7 +54,7 @@ cp -r -p sql/share/* $BASE/share/mysql; rm -f $BASE/share/mysql/Makefile* $BASE/ cp -p scripts/* $BASE/bin rm -f $BASE/bin/Makefile* $BASE/bin/*.in $BASE/bin/*.sh $BASE/bin/mysql_install_db $BASE/bin/make_binary_distribution $BASE/bin/setsomevars $BASE/support-files/Makefile* $BASE/support-files/*.sh -$BASE/bin/replace \@localstatedir\@ ./data \@bindir\@ ./bin \@scriptdir\@ ./bin \@libexecdir\@ ./bin \@prefix\@ . \@HOSTNAME\@ @HOSTNAME@ < $SOURCE/scripts/mysql_install_db.sh > $BASE/scripts/mysql_install_db +$BASE/bin/replace \@localstatedir\@ ./data \@bindir\@ ./bin \@scriptdir\@ ./bin \@libexecdir\@ ./bin \@sbindir\@ ./bin \@prefix\@ . \@HOSTNAME\@ @HOSTNAME@ < $SOURCE/scripts/mysql_install_db.sh > $BASE/scripts/mysql_install_db $BASE/bin/replace \@prefix\@ /usr/local/mysql \@bindir\@ ./bin \@MYSQLD_USER\@ root \@localstatedir\@ /usr/local/mysql/data < $SOURCE/support-files/mysql.server.sh > $BASE/support-files/mysql.server $BASE/bin/replace /my/gnu/bin/hostname /bin/hostname -- $BASE/bin/safe_mysqld 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 |