diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-11-14 09:43:30 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-11-14 09:43:30 +0100 |
| commit | c21f4e6e4c1da4e7affdfd03de526c72983c612a (patch) | |
| tree | 048b6a857ae6af98df723cc9c0685e1fdbd8df38 /mysql-test/Makefile.am | |
| parent | b3e5cc6bad3b2280bb6d352d202700a9c6bff3ac (diff) | |
| parent | 178dddb54f0085a9df637d847105f77986bbadf4 (diff) | |
| download | mariadb-git-c21f4e6e4c1da4e7affdfd03de526c72983c612a.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
mysql-test/Makefile.am:
Manual merge
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 aae6ce64574..471ac9641d2 100644 --- a/mysql-test/Makefile.am +++ b/mysql-test/Makefile.am @@ -32,7 +32,7 @@ endif benchdir_root= $(prefix) testdir = $(benchdir_root)/mysql-test -EXTRA_SCRIPTS = mysql-test-run.sh install_test_db.sh valgrind.supp $(PRESCRIPTS) +EXTRA_SCRIPTS = mysql-test-run-shell.sh install_test_db.sh valgrind.supp $(PRESCRIPTS) EXTRA_DIST = $(EXTRA_SCRIPTS) GENSCRIPTS = mysql-test-run-shell mysql-test-run install_test_db mtr PRESCRIPTS = mysql-test-run.pl |