diff options
author | unknown <joerg@trift2.> | 2007-07-17 21:11:22 +0200 |
---|---|---|
committer | unknown <joerg@trift2.> | 2007-07-17 21:11:22 +0200 |
commit | b3c1763fa0ba2fc039f3954a4f69d6dfd342982a (patch) | |
tree | 8e9fd900c2ee6c1017c62e3dd0762fbdbe094335 /mysql-test/Makefile.am | |
parent | 242579216b1a1649ad4e0b1d6fff494607f3baed (diff) | |
parent | f66354cc87fe938ca041de60a32c01c6995543b1 (diff) | |
download | mariadb-git-b3c1763fa0ba2fc039f3954a4f69d6dfd342982a.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.am | 2 |
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 \ |