diff options
| author | monty@narttu.mysql.fi <> | 2003-10-07 15:42:26 +0300 |
|---|---|---|
| committer | monty@narttu.mysql.fi <> | 2003-10-07 15:42:26 +0300 |
| commit | 6056cfadfcb07cda12f6dc01ec9c1ab07067ac69 (patch) | |
| tree | d89c080ef636608e316f1166b1628cd1d902deec /support-files | |
| parent | 0091fa2e3266da6a17b0615a4696c25a4d36d664 (diff) | |
| parent | 446d40e880c0e6ab6ac56b0082d4883ef5c7d467 (diff) | |
| download | mariadb-git-6056cfadfcb07cda12f6dc01ec9c1ab07067ac69.tar.gz | |
Merge with 4.0.16
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/my-small.cnf.sh | 2 | ||||
| -rw-r--r-- | support-files/mysql.server.sh | 25 |
2 files changed, 15 insertions, 12 deletions
diff --git a/support-files/my-small.cnf.sh b/support-files/my-small.cnf.sh index f9e30da78ac..3c4cafa688f 100644 --- a/support-files/my-small.cnf.sh +++ b/support-files/my-small.cnf.sh @@ -1,7 +1,7 @@ # Example mysql config file for small systems. # # This is for a system with little memory (<= 64M) where MySQL is only used -# from time to time and it's important that the mysqld deamon +# from time to time and it's important that the mysqld daemon # doesn't use much resources. # # You can copy this file to diff --git a/support-files/mysql.server.sh b/support-files/mysql.server.sh index ed973b61e57..dec77a15dc5 100644 --- a/support-files/mysql.server.sh +++ b/support-files/mysql.server.sh @@ -57,16 +57,6 @@ fi PATH=/sbin:/usr/sbin:/bin:/usr/bin:$basedir/bin export PATH -if test -z "$pid_file" -then - pid_file=$datadir/`@HOSTNAME@`.pid -else - case "$pid_file" in - /* ) ;; - * ) pid_file="$datadir/$pid_file" ;; - esac -fi - mode=$1 # start or stop parse_arguments() { @@ -119,6 +109,19 @@ else fi # +# Set pid file if not given +# +if test -z "$pid_file" +then + pid_file=$datadir/`@HOSTNAME@`.pid +else + case "$pid_file" in + /* ) ;; + * ) pid_file="$datadir/$pid_file" ;; + esac +fi + +# # Test if someone changed datadir; In this case we should also read the # default arguments from this directory # @@ -178,7 +181,7 @@ case "$mode" in # delete lock for RedHat / SuSE if test -f /var/lock/subsys/mysql then - rm /var/lock/subsys/mysql + rm -f /var/lock/subsys/mysql fi else echo "No mysqld pid file found. Looked for $pid_file." |