diff options
| author | unknown <dlenev@mysql.com> | 2006-05-02 23:16:53 +0400 |
|---|---|---|
| committer | unknown <dlenev@mysql.com> | 2006-05-02 23:16:53 +0400 |
| commit | 5d8f7471af244e8e04890df07d9de5fd91da8b55 (patch) | |
| tree | 174f8bda21dd95e723cbdb56e58c506381a70bba /tests/Makefile.am | |
| parent | 30e6df0ecd2a3505cf6f4ee7fd30c35ca8a0c625 (diff) | |
| parent | 853f5413f631146c42b97409aef5f1ac4ad3614a (diff) | |
| download | mariadb-git-5d8f7471af244e8e04890df07d9de5fd91da8b55.tar.gz | |
Merge mysql.com:/home/dlenev/mysql-5.0-bg11081
into mysql.com:/home/dlenev/mysql-5.1-merges
VC++Files/mysql.sln:
Auto merged
VC++Files/mysys/mysys.vcproj:
Auto merged
mysql-test/r/ps.result:
Auto merged
mysql-test/r/ps_1general.result:
Auto merged
mysql-test/r/timezone2.result:
Auto merged
mysql-test/t/ps.test:
Auto merged
mysql-test/t/ps_1general.test:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/tztime.cc:
Auto merged
sql/tztime.h:
Auto merged
tests/Makefile.am:
Auto merged
tests/mysql_client_test.c:
Auto merged
Diffstat (limited to 'tests/Makefile.am')
| -rw-r--r-- | tests/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 66f0c89f6c0..4cad3c30bdd 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -43,7 +43,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) -lmysys -L../mysys +mysql_client_test_LDADD= $(LDADD) $(CXXLDFLAGS) -L../mysys -lmysys 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) |