diff options
| author | unknown <tim@siva.hindu.god> | 2004-11-04 10:29:24 -0700 |
|---|---|---|
| committer | unknown <tim@siva.hindu.god> | 2004-11-04 10:29:24 -0700 |
| commit | 6ed9208e10bb31ddf297c9a3f65411c5bd7bda00 (patch) | |
| tree | ee0315782cf345d1877bd0971e113faed16eba4d | |
| parent | b80ed3bbb4a37a5be99e26aad6ab27b4ae34aa80 (diff) | |
| parent | 1d3f4a1a490656378131d66cb507145e5141fbdd (diff) | |
| download | mariadb-git-6ed9208e10bb31ddf297c9a3f65411c5bd7bda00.tar.gz | |
Merge siva.hindu.god:/opt/home/tim/m/40/bk
into siva.hindu.god:/opt/home/tim/m/40/a
configure.in:
Auto merged
| -rw-r--r-- | BitKeeper/etc/logging_ok | 1 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | scripts/mysqld_safe.sh | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 060586b6874..a716afb2392 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -139,6 +139,7 @@ tim@bitch.mysql.fi tim@black.box tim@hundin.mysql.fi tim@sand.box +tim@siva.hindu.god tim@threads.polyesthetic.msg tim@white.box tim@work.mysql.com diff --git a/configure.in b/configure.in index 0c520ca8980..06a0c1bd52f 100644 --- a/configure.in +++ b/configure.in @@ -444,7 +444,7 @@ if $PS p $$ 2> /dev/null | grep $0 > /dev/null then FIND_PROC="$PS p \$\$PID | grep mysqld > /dev/null" # Solaris -elif $PS -p $$ 2> /dev/null | grep $0 > /dev/null +elif $PS -fp $$ 2> /dev/null | grep $0 > /dev/null then FIND_PROC="$PS -p \$\$PID | grep mysqld > /dev/null" # BSD style diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh index b9e7ce21f79..da7e06f6c05 100644 --- a/scripts/mysqld_safe.sh +++ b/scripts/mysqld_safe.sh @@ -315,7 +315,7 @@ do break fi - if test @IS_LINUX@ -a $KILL_MYSQLD -eq 1 + if @IS_LINUX@ && test $KILL_MYSQLD -eq 1 then # Test if one process was hanging. # This is only a fix for Linux (running as base 3 mysqld processes) |