diff options
| author | unknown <stewart@willster.(none)> | 2006-07-24 02:32:49 +1000 |
|---|---|---|
| committer | unknown <stewart@willster.(none)> | 2006-07-24 02:32:49 +1000 |
| commit | 299b620d9f8c30543e2354aa8bc80e45ee874cbb (patch) | |
| tree | 3027f2b720bc598b336deade793d6e4098b414f6 /mysql-test/Makefile.am | |
| parent | 0a32f0626013ebd40e4da0a8e914b3a1e4bfe0f4 (diff) | |
| parent | ce3f15beb56bd0406f0794a10f36404d52c4e53b (diff) | |
| download | mariadb-git-299b620d9f8c30543e2354aa8bc80e45ee874cbb.tar.gz | |
Merge willster.(none):/home/stewart/Documents/MySQL/5.0/main
into willster.(none):/home/stewart/Documents/MySQL/5.1/main
BitKeeper/etc/config:
Auto merged
sql/opt_range.cc:
Auto merged
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupTabDesMan.cpp:
Auto merged
storage/ndb/test/ndbapi/testDict.cpp:
Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
Auto merged
mysql-test/Makefile.am:
manual merge
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
manual merge
Diffstat (limited to 'mysql-test/Makefile.am')
| -rw-r--r-- | mysql-test/Makefile.am | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am index 5aaddf36aa3..852ec463420 100644 --- a/mysql-test/Makefile.am +++ b/mysql-test/Makefile.am @@ -112,6 +112,7 @@ install-data-local: uninstall-local: @RM@ -f -r $(DESTDIR)$(testdir) + SUFFIXES = .sh .sh: |