summaryrefslogtreecommitdiff
path: root/mysql-test/Makefile.am
diff options
context:
space:
mode:
authorunknown <joerg@trift2.>2007-07-17 21:11:22 +0200
committerunknown <joerg@trift2.>2007-07-17 21:11:22 +0200
commit0b0277b47a99a29bc0ac9ee8bf428081359731b5 (patch)
tree8e9fd900c2ee6c1017c62e3dd0762fbdbe094335 /mysql-test/Makefile.am
parent035346fcff6070dae08c134094f7cd1be980492c (diff)
parent3ec7c63645f8b6111cef864718fb8c6dfc298b0f (diff)
downloadmariadb-git-0b0277b47a99a29bc0ac9ee8bf428081359731b5.tar.gz
Merge trift2.:/MySQL/M50/bug21023-25486-5.0
into trift2.:/MySQL/M51/bug21023-25486-5.1 mysql-test/Makefile.am: Auto merged scripts/make_binary_distribution.sh: Auto merged support-files/Makefile.am: SCCS merged
Diffstat (limited to 'mysql-test/Makefile.am')
-rw-r--r--mysql-test/Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am
index acb9ba36bda..c783158b46c 100644
--- a/mysql-test/Makefile.am
+++ b/mysql-test/Makefile.am
@@ -26,7 +26,7 @@ EXTRA_SCRIPTS = mysql-test-run-shell.sh install_test_db.sh \
valgrind.supp $(PRESCRIPTS)
EXTRA_DIST = $(EXTRA_SCRIPTS) suite
GENSCRIPTS = mysql-test-run-shell install_test_db mtr mysql-test-run
-PRESCRIPTS = mysql-test-run.pl
+PRESCRIPTS = mysql-test-run.pl mysql-stress-test.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 \