diff options
| author | unknown <pgalbraith@bk-internal.mysql.com> | 2006-12-09 02:34:42 +0100 |
|---|---|---|
| committer | unknown <pgalbraith@bk-internal.mysql.com> | 2006-12-09 02:34:42 +0100 |
| commit | 9e82f299e526ceafd0deb105f0487681406b1be8 (patch) | |
| tree | a683748b700b98b6f378009228727821e369623b /tests | |
| parent | b0a5cd8ed133b8bce2ab470826dd8d91ec27fa9d (diff) | |
| parent | e54bbaa3fb8793905d37af808b9bee6a49df358a (diff) | |
| download | mariadb-git-9e82f299e526ceafd0deb105f0487681406b1be8.tar.gz | |
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
client/mysql.cc:
Auto merged
sql/field_conv.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.am | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index e9bcb4693fd..43d90a9e03c 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -17,11 +17,6 @@ ## Process this file with automake to create Makefile.in -if HAVE_YASSL - yassl_dummy_link_fix= $(top_srcdir)/extra/yassl/src/dummy.cpp -else - yassl_dummy_link_fix= -endif if THREAD_SAFE_CLIENT LIBMYSQLCLIENT_LA = $(top_builddir)/libmysql_r/libmysqlclient_r.la @@ -42,9 +37,6 @@ EXTRA_DIST = auto_increment.res auto_increment.tst \ bin_PROGRAMS = mysql_client_test noinst_PROGRAMS = insert_test select_test thread_test -# -# C Test for 4.1 protocol -# INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \ $(openssl_includes) LIBS = @CLIENT_LIBS@ @@ -52,11 +44,11 @@ LDADD = @CLIENT_EXTRA_LDFLAGS@ \ $(LIBMYSQLCLIENT_LA) mysql_client_test_LDADD= $(LDADD) $(CXXLDFLAGS) -mysql_client_test_SOURCES= mysql_client_test.c $(yassl_dummy_link_fix) \ +mysql_client_test_SOURCES= mysql_client_test.c\ $(top_srcdir)/mysys/my_memmem.c -insert_test_SOURCES= insert_test.c $(yassl_dummy_link_fix) -select_test_SOURCES= select_test.c $(yassl_dummy_link_fix) +insert_test_SOURCES= insert_test.c +select_test_SOURCES= select_test.c insert_test_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES) select_test_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES) |