diff options
| author | unknown <monty@work.mysql.com> | 2001-04-19 00:58:30 +0200 |
|---|---|---|
| committer | unknown <monty@work.mysql.com> | 2001-04-19 00:58:30 +0200 |
| commit | 7337a193b1bb590c127daa9d92839e476e9b219f (patch) | |
| tree | 7492d30d693c0862c24d2824ac91384a71a3c5e9 /sql/Makefile.am | |
| parent | c778d3374cdaa5760ce41d9febe070266055a6f0 (diff) | |
| parent | 09518126f1d05214b2e6518825d819cc86138f1f (diff) | |
| download | mariadb-git-7337a193b1bb590c127daa9d92839e476e9b219f.tar.gz | |
Merge
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
client/mysql.cc:
Auto merged
client/mysqltest.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
sql/sql_select.cc:
Auto merged
Docs/manual.texi:
SCCS merged
sql/Makefile.am:
SCCS merged
Diffstat (limited to 'sql/Makefile.am')
| -rw-r--r-- | sql/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/Makefile.am b/sql/Makefile.am index 5af1b2900ff..3d66850527e 100644 --- a/sql/Makefile.am +++ b/sql/Makefile.am @@ -43,7 +43,7 @@ LDADD = ../isam/libnisam.a \ mysqld_LDADD = @MYSQLD_EXTRA_LDFLAGS@ \ @bdb_libs@ @innodb_libs@ @pstack_libs@ \ @gemini_libs@ \ - $(LDADD) $(CXXLDFLAGS) $(WRAPLIBS) + $(LDADD) $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \ item_strfunc.h item_timefunc.h item_uniq.h \ item_create.h mysql_priv.h \ |