summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authormonty@donna.mysql.com <>2000-09-12 03:02:33 +0300
committermonty@donna.mysql.com <>2000-09-12 03:02:33 +0300
commit2776500c220c92bb78df03513cc3dd33588f40e5 (patch)
tree051686baf31e5363765879f2437ada3abea6b71b /scripts
parent497007e2bd9cb127d54a4fdb02253301f404ce7f (diff)
downloadmariadb-git-2776500c220c92bb78df03513cc3dd33588f40e5.tar.gz
Update to new root alloc, OPTIMIZE TABLE and some other changes
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/safe_mysqld.sh4
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@