diff options
| author | joerg@mysql.com <> | 2005-04-26 12:03:37 +0200 |
|---|---|---|
| committer | joerg@mysql.com <> | 2005-04-26 12:03:37 +0200 |
| commit | 49ac2dac3e148b994859ab8b43de40270ed409b5 (patch) | |
| tree | 456de671941d212a8a4e3a9cea7082b09ca1d0fd /scripts | |
| parent | b890c05b4dd3461879a30da3b9cbf44e8f7b6040 (diff) | |
| parent | 70ed0ea4cb109262fe3ba18705f94f4f70fcf239 (diff) | |
| download | mariadb-git-49ac2dac3e148b994859ab8b43de40270ed409b5.tar.gz | |
Automerge / manual check of the fixes for NPTL configuration (bug#2173, bug#5871, and bug#9497).
Post-merge fix will follow.
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 82a4fc2ca92..b2fef9acadf 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 10983d2850f..9ec573737bd 100644 --- a/scripts/mysqld_safe.sh +++ b/scripts/mysqld_safe.sh @@ -368,7 +368,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) |