summaryrefslogtreecommitdiff
path: root/myisam
diff options
context:
space:
mode:
authorjoerg@mysql.com <>2005-04-26 12:03:37 +0200
committerjoerg@mysql.com <>2005-04-26 12:03:37 +0200
commit49ac2dac3e148b994859ab8b43de40270ed409b5 (patch)
tree456de671941d212a8a4e3a9cea7082b09ca1d0fd /myisam
parentb890c05b4dd3461879a30da3b9cbf44e8f7b6040 (diff)
parent70ed0ea4cb109262fe3ba18705f94f4f70fcf239 (diff)
downloadmariadb-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 'myisam')
-rw-r--r--myisam/Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/myisam/Makefile.am b/myisam/Makefile.am
index e77e46cb7a3..c61647b25f7 100644
--- a/myisam/Makefile.am
+++ b/myisam/Makefile.am
@@ -88,7 +88,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@!' \