diff options
| author | unknown <jimw@mysql.com> | 2005-08-24 15:54:23 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-08-24 15:54:23 -0700 |
| commit | ffc086e60a5cdf0632d7987ddda438a4991db8fa (patch) | |
| tree | 2408b4ed8fd028e82c29e702dde98508806df16c /tests | |
| parent | ce38e65bdcbb6c94d4599b03079bb4e7d41af82d (diff) | |
| parent | 4b9431369611b4c3938288c0ef9eaa282f1bb417 (diff) | |
| download | mariadb-git-ffc086e60a5cdf0632d7987ddda438a4991db8fa.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-5.0-11680
into mysql.com:/home/jimw/my/mysql-5.0-clean
configure.in:
Auto merged
sql/hostname.cc:
Resolve conflict
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.am | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index ca7f04c91f9..131f8b1b625 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -42,8 +42,7 @@ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \ LIBS = @CLIENT_LIBS@ LDADD = @CLIENT_EXTRA_LDFLAGS@ \ $(top_builddir)/libmysql/libmysqlclient.la -mysql_client_test_LDADD= $(LDADD) $(CXXLDFLAGS) \ - $(top_builddir)/mysys/libmysys.a +mysql_client_test_LDADD= $(LDADD) $(CXXLDFLAGS) mysql_client_test_SOURCES= mysql_client_test.c $(yassl_dummy_link_fix) insert_test_SOURCES= insert_test.c $(yassl_dummy_link_fix) select_test_SOURCES= select_test.c $(yassl_dummy_link_fix) |