diff options
| author | unknown <mtaylor@qualinost.(none)> | 2007-04-12 11:01:32 -0700 |
|---|---|---|
| committer | unknown <mtaylor@qualinost.(none)> | 2007-04-12 11:01:32 -0700 |
| commit | 49e9743d1a40bca3fb2579d727ac407119680780 (patch) | |
| tree | c3673ebd2b922750633a49be6c1323972b89b4a5 /support-files | |
| parent | 1aee96652356e64574a3a588d1fdad0d225b6187 (diff) | |
| parent | 428e4b07049d28224eaa067488b717c0032aa936 (diff) | |
| download | mariadb-git-49e9743d1a40bca3fb2579d727ac407119680780.tar.gz | |
Merge qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-initstatus
into qualinost.(none):/home/mtaylor/src/mysql/mysql-firsttwo
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/mysql.server.sh | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/support-files/mysql.server.sh b/support-files/mysql.server.sh index a907f81eb3f..b587bfdcdd7 100644 --- a/support-files/mysql.server.sh +++ b/support-files/mysql.server.sh @@ -371,7 +371,7 @@ case "$mode" in ;; 'status') # First, check to see if pid file exists - if [ -s "$server_pid_file" ] ; then + if test -s "$server_pid_file" ; then read mysqld_pid < $server_pid_file if kill -0 $mysqld_pid 2>/dev/null ; then log_success_msg "MySQL running ($mysqld_pid)" @@ -383,7 +383,16 @@ case "$mode" in else # Try to find appropriate mysqld process mysqld_pid=`pidof $sbindir/mysqld` - if [ -z $mysqld_pid ] ; then + if test -z $mysqld_pid ; then + if test "$use_mysqld_safe" = "0" ; then + lockfile=/var/lock/subsys/mysqlmanager + else + lockfile=/var/lock/subsys/mysql + fi + if test -f $lockfile ; then + log_failure_msg "MySQL is not running, but lock exists" + exit 2 + fi log_failure_msg "MySQL is not running" exit 3 else |