database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Use @HOSTNAME@ instead of hardcoded /bin/hostname.

Browse Source
This commit is contained in:
tim@localhost.polyesthetic.msg
2000-08-09 14:57:59 -04:00
parent c6c775c982
commit 621c7db2f7
3 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/mysql_install_db.sh
View File

@ -77,9 +77,7 @@ then
fi fi
fi fi
# On IRIX hostname is in /usr/bsd so add this to the path hostname=`@HOSTNAME@` # Install this too in the user table
PATH=$PATH:/usr/bsd
hostname=`hostname` # Install this too in the user table
# Check if hostname is valid # Check if hostname is valid
if test "$IN_RPM" -eq 0 -a $force -eq 0 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 "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !"
echo "This is done with:" echo "This is done with:"
echo "$bindir/mysqladmin -u root -p password 'new-password'" 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." echo "See the manual for more instructions."
# #
# Print message about upgrading unless we have created a new db table. # Print message about upgrading unless we have created a new db table.

9
scripts/safe_mysqld-watch.sh
View File

@ -30,10 +30,11 @@ else
ledir=/usr/local/mysql/libexec ledir=/usr/local/mysql/libexec
fi fi
pidfile=$DATADIR/`/bin/hostname`.pid hostname=`@HOSTNAME@`
log=$DATADIR/`/bin/hostname`.log pidfile=$DATADIR/$hostname.pid
err=$DATADIR/`/bin/hostname`.err log=$DATADIR/$hostname.log
lockfile=$DATADIR/`/bin/hostname`.lock err=$DATADIR/$hostname.err
lockfile=$DATADIR/$hostname.lock
# #
# If there exists an old pid file, check if the demon is already running # If there exists an old pid file, check if the demon is already running

6
scripts/safe_mysqld.sh
View File

@ -56,11 +56,11 @@ else
ledir=@libexecdir@ ledir=@libexecdir@
fi fi
pid_file=$DATADIR/`/bin/hostname`.pid pid_file=$DATADIR/`@HOSTNAME@`.pid
MYSQL_UNIX_PORT=@MYSQL_UNIX_ADDR@ MYSQL_UNIX_PORT=@MYSQL_UNIX_ADDR@
MYSQL_TCP_PORT=@MYSQL_TCP_PORT@ MYSQL_TCP_PORT=@MYSQL_TCP_PORT@
log=$DATADIR/`/bin/hostname`.log log=$DATADIR/`@HOSTNAME@`.log
err_log=$DATADIR/`/bin/hostname`.err err_log=$DATADIR/`@HOSTNAME@`.err
user=@MYSQLD_USER@ user=@MYSQLD_USER@
# Get first arguments from the my.cfg file, groups [mysqld] and [safe_mysqld] # Get first arguments from the my.cfg file, groups [mysqld] and [safe_mysqld]