diff options
| author | unknown <kent@kent-amd64.(none)> | 2007-07-30 21:45:06 +0200 |
|---|---|---|
| committer | unknown <kent@kent-amd64.(none)> | 2007-07-30 21:45:06 +0200 |
| commit | 813c25108afa34f1cae77619512913f32d5c8fb1 (patch) | |
| tree | 5f6b80946cde6491267528d12fd847be02056ebc /mysql-test/Makefile.am | |
| parent | 5d4a2573328ece1002759af88457798c3e638724 (diff) | |
| parent | 46d5ebb120f17e9e2ad1490d1e572a3b0cd145bf (diff) | |
| download | mariadb-git-813c25108afa34f1cae77619512913f32d5c8fb1.tar.gz | |
Merge mysql.com:/home/kent/bk/config_h/mysql-5.0-build
into mysql.com:/home/kent/bk/config_h/mysql-5.1-build
config/ac-macros/misc.m4:
Auto merged
configure.in:
Auto merged
include/Makefile.am:
Auto merged
mysql-test/std_data/cacert.pem:
Auto merged
mysql-test/std_data/client-cert.pem:
Auto merged
mysql-test/std_data/client-key.pem:
Auto merged
mysql-test/std_data/server-cert.pem:
Auto merged
mysql-test/std_data/server-key.pem:
Auto merged
mysys/my_pthread.c:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
BitKeeper/deleted/.del-Makefile.am~de166d6fcac3b9b6:
Auto merged
Diffstat (limited to 'mysql-test/Makefile.am')
| -rw-r--r-- | mysql-test/Makefile.am | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am index c783158b46c..e1b0f29e253 100644 --- a/mysql-test/Makefile.am +++ b/mysql-test/Makefile.am @@ -28,9 +28,6 @@ EXTRA_DIST = $(EXTRA_SCRIPTS) suite GENSCRIPTS = mysql-test-run-shell install_test_db mtr mysql-test-run 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 \ - std_data/server-key.pem CLEANFILES = $(GENSCRIPTS) INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I.. |