summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <jimw@mysql.com>2006-04-13 13:22:44 -0700
committerunknown <jimw@mysql.com>2006-04-13 13:22:44 -0700
commit34ec514bdab0f218379358f0822cb760a72f56af (patch)
tree4ca24925b7411efde51b9dab22246b646493342e
parent79c4d5c9c76378f288765afad00b527f3cf9fe22 (diff)
parent15e00446ac74f0f060b75aacba987ba23a28f8a9 (diff)
downloadmariadb-git-34ec514bdab0f218379358f0822cb760a72f56af.tar.gz
Merge mysql.com:/home/jimw/my/mysql-5.1-kill-sql-bench
into mysql.com:/home/jimw/my/mysql-5.1-clean
-rw-r--r--mysql-test/Makefile.am7
1 files changed, 4 insertions, 3 deletions
diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am
index dcf2b49adfc..8ddf7668844 100644
--- a/mysql-test/Makefile.am
+++ b/mysql-test/Makefile.am
@@ -27,9 +27,10 @@ EXTRA_DIST = $(EXTRA_SCRIPTS)
GENSCRIPTS = mysql-test-run install_test_db
PRESCRIPTS = mysql-test-run.pl
test_SCRIPTS = $(GENSCRIPTS) $(PRESCRIPTS)
-test_DATA = std_data/client-key.pem std_data/client-cert.pem std_data/cacert.pem \
- std_data/server-cert.pem std_data/server-key.pem
-CLEANFILES = $(GENSCRIPTS) $(test_DATA)
+test_DATA = std_data/client-key.pem std_data/client-cert.pem \
+ std_data/cacert.pem std_data/server-cert.pem \
+ std_data/server-key.pem
+CLEANFILES = $(GENSCRIPTS)
INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I..