diff options
| author | unknown <joerg@mysql.com> | 2005-04-26 12:03:37 +0200 |
|---|---|---|
| committer | unknown <joerg@mysql.com> | 2005-04-26 12:03:37 +0200 |
| commit | a783db511b45fa0a99c583d23ea227fae4fcbc16 (patch) | |
| tree | 456de671941d212a8a4e3a9cea7082b09ca1d0fd /support-files | |
| parent | 22311d277511e5412c1dd3c3b70d7e4104c948ab (diff) | |
| parent | 8a9c988122135441d35bbab1b70c3e0ccb88b7a4 (diff) | |
| download | mariadb-git-a783db511b45fa0a99c583d23ea227fae4fcbc16.tar.gz | |
Automerge / manual check of the fixes for NPTL configuration (bug#2173, bug#5871, and bug#9497).
Post-merge fix will follow.
BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
Automerge / manual check.
configure.in:
Automerge / manual check.
include/my_global.h:
Automerge / manual check.
myisam/Makefile.am:
Automerge / manual check.
scripts/Makefile.am:
Automerge / manual check.
scripts/mysqld_safe.sh:
Automerge / manual check.
support-files/Makefile.am:
Automerge / manual check.
tools/mysqlmanager.c:
Automerge / manual check.
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/support-files/Makefile.am b/support-files/Makefile.am index 0a6077f0efc..5f5a10fc1fc 100644 --- a/support-files/Makefile.am +++ b/support-files/Makefile.am @@ -90,7 +90,7 @@ SUFFIXES = .sh -e 's!@''FIND_PROC''@!@FIND_PROC@!' \ -e 's!@''MYSQLD_DEFAULT_SWITCHES''@!@MYSQLD_DEFAULT_SWITCHES@!' \ -e 's!@''MYSQL_UNIX_ADDR''@!@MYSQL_UNIX_ADDR@!' \ - -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!@''sysconfdir''@!@sysconfdir@!' \ |