diff options
| author | unknown <tim@siva.hindu.god> | 2004-11-02 17:53:25 -0700 |
|---|---|---|
| committer | unknown <tim@siva.hindu.god> | 2004-11-02 17:53:25 -0700 |
| commit | 1d3f4a1a490656378131d66cb507145e5141fbdd (patch) | |
| tree | 4d42cfcc0328f842a6db1b61728953204bde676e /scripts/mysqld_safe.sh | |
| parent | 9c06c80dff5744ac0b1d214404c9d16f752e41bb (diff) | |
| download | mariadb-git-1d3f4a1a490656378131d66cb507145e5141fbdd.tar.gz | |
Portability fixes to mysqld_safe for non-Linux systems. Fix FIND_PROC
for Solaris test, and fix if @IS_LINUX@ test in mysqld_safe itself.
configure.in:
Portability fix for FIND_PROC setting; on Solaris (and
probably others), 'ps -p $$' inside a shell script just
returns 'sh' for command line, even though $0 contains
the filename. So, use 'ps -fp $$' in the test (it shows
the full command line, e.g., 'sh configure'). Leave the
actual FIND_PROC command as-is, since mysqld itself is
not a shell script.
scripts/mysqld_safe.sh:
Portability fix for mysqld_safe on non-Linux systems. A bogus use
of 'if' and 'test' caused non-bash shells to enter a section meant
to be run only on Linux systems.
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Diffstat (limited to 'scripts/mysqld_safe.sh')
| -rw-r--r-- | scripts/mysqld_safe.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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) |