Merge mysql.com:/home/jimw/my/mysql-5.1-kill-sql-bench

into mysql.com:/home/jimw/my/mysql-5.1-clean

Merge mysql.com:/home/jimw/my/mysql-5.1-kill-sql-bench
into mysql.com:/home/jimw/my/mysql-5.1-clean
2396a360 · jimw@mysql.com · 4cfc3780 · 515da467 · 2396a360
Commit 2396a360 authored Apr 13, 2006 by jimw@mysql.com
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

mysql-test/Makefile.am mysql-test/Makefile.am +4 -3

No files found.
--- 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..