diff options
| author | unknown <joerg@mysql.com> | 2005-04-20 20:10:28 +0200 |
|---|---|---|
| committer | unknown <joerg@mysql.com> | 2005-04-20 20:10:28 +0200 |
| commit | 677fbc7d4e34dff14aaf49efa114bc85aa986da1 (patch) | |
| tree | e5a16eb04178034baefbec26ae1481e5d641a208 /scripts | |
| parent | 24dd3ea806742038fd41d8f7481a35e248b95bf5 (diff) | |
| download | mariadb-git-677fbc7d4e34dff14aaf49efa114bc85aa986da1.tar.gz | |
Step 1 of the switch to support configuration with NPTL:
Rename 'IS_LINUX' configuration variable to 'TARGET_LINUX'.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.am | 2 | ||||
| -rw-r--r-- | scripts/mysqld_safe.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/Makefile.am b/scripts/Makefile.am index b170fa483b2..e2ef1bba97c 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -135,7 +135,7 @@ SUFFIXES = .sh -e 's!@''MYSQLD_DEFAULT_SWITCHES''@!@MYSQLD_DEFAULT_SWITCHES@!' \ -e 's!@''MYSQL_UNIX_ADDR''@!@MYSQL_UNIX_ADDR@!' \ -e 's!@''MYSQL_TCP_PORT''@!@MYSQL_TCP_PORT@!' \ - -e 's!@''IS_LINUX''@!@IS_LINUX@!' \ + -e 's!@''TARGET_LINUX''@!@TARGET_LINUX@!' \ -e "s!@""CONF_COMMAND""@!@CONF_COMMAND@!" \ -e 's!@''MYSQLD_USER''@!@MYSQLD_USER@!' \ -e 's!@''STATIC_NSS_FLAGS''@!@STATIC_NSS_FLAGS@!' \ diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh index 308db270828..8a232f4f7f9 100644 --- a/scripts/mysqld_safe.sh +++ b/scripts/mysqld_safe.sh @@ -324,7 +324,7 @@ do break fi - if @IS_LINUX@ && test $KILL_MYSQLD -eq 1 + if @TARGET_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) |