summaryrefslogtreecommitdiff
path: root/client/Makefile.am
diff options
context:
space:
mode:
authorHe Zhenxing <hezx@mysql.com>2008-08-14 17:38:22 +0800
committerHe Zhenxing <hezx@mysql.com>2008-08-14 17:38:22 +0800
commit113deaec30e0e555da507ecea96bcf5fead75e68 (patch)
tree31a73acd88f94657202f99602c9de4d9364a589f /client/Makefile.am
parent93d835213e1c5bb6bad455ef6a4877a960e638f3 (diff)
parent193a8f973598d573ab8cc633f143fd1dfa4195bf (diff)
downloadmariadb-git-113deaec30e0e555da507ecea96bcf5fead75e68.tar.gz
Merge 5.1-rpl-testfixes -> 5.1-rpl
Diffstat (limited to 'client/Makefile.am')
-rw-r--r--client/Makefile.am3
1 files changed, 2 insertions, 1 deletions
diff --git a/client/Makefile.am b/client/Makefile.am
index 94ad6c15d99..93b64da15e3 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -92,7 +92,8 @@ mysqltest_LDADD = $(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \
@CLIENT_EXTRA_LDFLAGS@ \
$(LIBMYSQLCLIENT_LA) \
$(top_builddir)/mysys/libmysys.a \
- $(top_builddir)/regex/libregex.a
+ $(top_builddir)/regex/libregex.a \
+ $(CLIENT_THREAD_LIBS)
mysql_upgrade_SOURCES= mysql_upgrade.c \
$(top_srcdir)/mysys/my_getpagesize.c