diff options
| author | unknown <kent@kent-amd64.(none)> | 2007-09-26 18:49:09 +0200 |
|---|---|---|
| committer | unknown <kent@kent-amd64.(none)> | 2007-09-26 18:49:09 +0200 |
| commit | d8352a39eef7f35b705ab2a9a8a089e93e66fc02 (patch) | |
| tree | 021b1b7b7aa7d79d72c895364c29f3234605d7b0 /mysql-test/Makefile.am | |
| parent | 9a640f848e465f2bebd27072fa651a230e9632f9 (diff) | |
| parent | fb5f16f9924047f2e4afaa4f571018c78eaa7e07 (diff) | |
| download | mariadb-git-d8352a39eef7f35b705ab2a9a8a089e93e66fc02.tar.gz | |
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into mysql.com:/home/kent/bk/make-dist-stable/mysql-5.1-build
configure.in:
Auto merged
mysql-test/Makefile.am:
Auto merged
Diffstat (limited to 'mysql-test/Makefile.am')
| -rw-r--r-- | mysql-test/Makefile.am | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am index 86da057a13c..eb31e9057cc 100644 --- a/mysql-test/Makefile.am +++ b/mysql-test/Makefile.am @@ -18,7 +18,6 @@ ## Process this file with automake to create Makefile.in SUBDIRS = ndb -DIST_SUBDIRS=ndb benchdir_root= $(prefix) testdir = $(benchdir_root)/mysql-test |