diff options
| author | unknown <monty@donna.mysql.com> | 2000-09-12 03:14:13 +0300 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2000-09-12 03:14:13 +0300 |
| commit | de04a97b613356f19bfbe67856cda64774865832 (patch) | |
| tree | c167967c90129e2f7d3757c7e35b3ccd2668436e /scripts | |
| parent | 2f6af71721a990b807ab07805a188b1f03b6d213 (diff) | |
| parent | fe4cccd6a43496395ec52e9043cd4350e5eac69d (diff) | |
| download | mariadb-git-de04a97b613356f19bfbe67856cda64774865832.tar.gz | |
Merge
sql/slave.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/safe_mysqld.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/safe_mysqld.sh b/scripts/safe_mysqld.sh index 55147a84852..1ad9e962096 100755 --- a/scripts/safe_mysqld.sh +++ b/scripts/safe_mysqld.sh @@ -58,8 +58,8 @@ else fi pid_file=$DATADIR/`@HOSTNAME@`.pid -MYSQL_UNIX_PORT=@MYSQL_UNIX_ADDR@ -MYSQL_TCP_PORT=@MYSQL_TCP_PORT@ +MYSQL_UNIX_PORT=${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@} +MYSQL_TCP_PORT=${MYSQL_TCP_PORT:-@MYSQL_TCP_PORT@} log=$DATADIR/`@HOSTNAME@`.log err_log=$DATADIR/`@HOSTNAME@`.err user=@MYSQLD_USER@ |