summaryrefslogtreecommitdiff
path: root/sql/Makefile.am
diff options
context:
space:
mode:
authorserg@serg.mysql.com <>2001-04-15 20:14:40 +0200
committerserg@serg.mysql.com <>2001-04-15 20:14:40 +0200
commit5d86c27a2d4e5a4851720b27f8ef733b174cb778 (patch)
treeb8726fd9a65296176ce63f6bacfb6002311f5418 /sql/Makefile.am
parent6a41e1f3a5a4fbe08e4e5743060a62964b8f6f40 (diff)
downloadmariadb-git-5d86c27a2d4e5a4851720b27f8ef733b174cb778.tar.gz
mysqltest bugfix
typo/bad merge fixed chmod a-x for man/*.1 files
Diffstat (limited to 'sql/Makefile.am')
-rw-r--r--sql/Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/Makefile.am b/sql/Makefile.am
index 2fc621090b3..5af1b2900ff 100644
--- a/sql/Makefile.am
+++ b/sql/Makefile.am
@@ -41,7 +41,7 @@ LDADD = ../isam/libnisam.a \
../regex/libregex.a \
../strings/libmystrings.a
mysqld_LDADD = @MYSQLD_EXTRA_LDFLAGS@ \
- @bdb_libs@ @innobase_libs@ @pstack_libs@ \
+ @bdb_libs@ @innodb_libs@ @pstack_libs@ \
@gemini_libs@ \
$(LDADD) $(CXXLDFLAGS) $(WRAPLIBS)
noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \