summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2012-05-02 17:06:30 +0200
committerSergei Golubchik <sergii@pisem.net>2012-05-02 17:06:30 +0200
commitb192f7a2e7689e67427e55ed8b01926cc1fa9f37 (patch)
tree0909db1daed8e3e23bf9e87d2827339ced3d66f2
parent26fcc55017d0f199c06688e09b21b7b00027171d (diff)
parenta37768e11d3eebab700dd4bb8fd271bda003dae3 (diff)
downloadmariadb-git-b192f7a2e7689e67427e55ed8b01926cc1fa9f37.tar.gz
5.1 merge
-rw-r--r--client/Makefile.am1
1 files changed, 0 insertions, 1 deletions
diff --git a/client/Makefile.am b/client/Makefile.am
index 4e7fe46d9fc..72540de0fe8 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -91,7 +91,6 @@ mysqltest_LDADD = $(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \
$(top_builddir)/mysys/libmysys.a \
$(LIBMYSQLCLIENT_LA) \
$(top_builddir)/regex/libregex.la
- $(CLIENT_THREAD_LIBS)
mysql_upgrade_SOURCES= mysql_upgrade.c \
$(top_srcdir)/mysys/my_getpagesize.c