diff options
author | unknown <knielsen@rt.int.sifira.dk> | 2006-07-04 12:08:58 +0200 |
---|---|---|
committer | unknown <knielsen@rt.int.sifira.dk> | 2006-07-04 12:08:58 +0200 |
commit | 520cd485395d058da51fbc89ed5ac2c75701920a (patch) | |
tree | 7f1051963c806c7b8e99a152c1969c44d6f2b7a7 /tests | |
parent | 3e085bd882a7283d43423c82d412ce276ff4ddcb (diff) | |
parent | ce3e4de964f656d2f35a953a88eea6e3ce20ca28 (diff) | |
download | mariadb-git-520cd485395d058da51fbc89ed5ac2c75701920a.tar.gz |
Merge mysqldev@production:my/mysql-5.0-release
into rt.int.sifira.dk:/usr/local/mysql/tmp-5.0
include/my_sys.h:
Auto merged
mysql-test/r/key.result:
Auto merged
mysql-test/t/key.test:
Auto merged
sql/table.cc:
Auto merged
sql/handler.h:
Auto merged
sql/sql_update.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
Diffstat (limited to 'tests')
-rw-r--r-- | tests/Makefile.am | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index ebe97393045..ab747d6e4ec 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -42,8 +42,14 @@ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \ LIBS = @CLIENT_LIBS@ LDADD = @CLIENT_EXTRA_LDFLAGS@ \ $(top_builddir)/libmysql/libmysqlclient.la +if HAVE_NETWARE +mysql_client_test_LDADD= $(LDADD) $(CXXLDFLAGS) +mysql_client_test_SOURCES= mysql_client_test.c $(yassl_dummy_link_fix) \ + ../mysys/my_memmem.c +else mysql_client_test_LDADD= $(LDADD) $(CXXLDFLAGS) -L../mysys -lmysys mysql_client_test_SOURCES= mysql_client_test.c $(yassl_dummy_link_fix) +endif insert_test_SOURCES= insert_test.c $(yassl_dummy_link_fix) select_test_SOURCES= select_test.c $(yassl_dummy_link_fix) insert_test_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES) |