diff options
| author | unknown <lenz@mysql.com> | 2005-06-10 15:41:30 +0200 |
|---|---|---|
| committer | unknown <lenz@mysql.com> | 2005-06-10 15:41:30 +0200 |
| commit | d7a17f0d87e610823b697d87a4df8caed65c5325 (patch) | |
| tree | dde69013a079276c071fe3367718f806a8918ee6 /mysql-test/Makefile.am | |
| parent | 25203acbb76d3ae8079229a6cdd6f13977a1b660 (diff) | |
| parent | 7568579aab0304083c9301a830a997f9c32a926a (diff) | |
| download | mariadb-git-d7a17f0d87e610823b697d87a4df8caed65c5325.tar.gz | |
Merge mysql.com:/space/my/mysql-4.1-build
into mysql.com:/space/my/mysql-5.0
mysql-test/Makefile.am:
Auto merged
Diffstat (limited to 'mysql-test/Makefile.am')
| -rw-r--r-- | mysql-test/Makefile.am | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am index 3cd1fb6f996..3a59a060778 100644 --- a/mysql-test/Makefile.am +++ b/mysql-test/Makefile.am @@ -35,7 +35,8 @@ testdir = $(benchdir_root)/mysql-test EXTRA_SCRIPTS = mysql-test-run.sh mysql-test-run.pl install_test_db.sh valgrind.supp EXTRA_DIST = $(EXTRA_SCRIPTS) test_SCRIPTS = mysql-test-run install_test_db -test_DATA = std_data/client-key.pem std_data/client-cert.pem std_data/cacert.pem +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 = $(test_SCRIPTS) $(test_DATA) INCLUDES = -I$(srcdir)/../include -I../include -I.. |