diff options
| author | unknown <cmiller@zippy.(none)> | 2006-05-01 22:50:36 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.(none)> | 2006-05-01 22:50:36 -0400 |
| commit | 4d1cd02ef6fb976b12b0ee9542f49ababc81abeb (patch) | |
| tree | aae6cd99ec61e48a42db408ac62d15a8261284d3 /tests/Makefile.am | |
| parent | 71c4827b8117f6626371a6389bc91496605ebf3c (diff) | |
| parent | 3010890e589de89d2f5bb4c0e2c3a0b06b827b10 (diff) | |
| download | mariadb-git-4d1cd02ef6fb976b12b0ee9542f49ababc81abeb.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into zippy.(none):/home/cmiller/work/mysql/mysql-5.0__bug17667
mysys/Makefile.am:
Auto merged
sql/sql_parse.cc:
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 131f8b1b625..ec732462ca5 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -42,7 +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) +mysql_client_test_LDADD= $(LDADD) $(CXXLDFLAGS) -lmysys -L../mysys 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) |