diff options
| author | joerg@debian.(none) <> | 2007-07-26 18:40:46 +0200 |
|---|---|---|
| committer | joerg@debian.(none) <> | 2007-07-26 18:40:46 +0200 |
| commit | 25f39c08bb8f1109065a2cd229f539ace55057b9 (patch) | |
| tree | ef6c304d454994f96d022d77f8979dc9d130e533 /Makefile.am | |
| parent | 6df53ea2df58e94cda2dfe9bc2ddb126f5efbd04 (diff) | |
| parent | 1e455b4c28ae1e14f733f51189ff03cadbc15412 (diff) | |
| download | mariadb-git-25f39c08bb8f1109065a2cd229f539ace55057b9.tar.gz | |
Merge debian.(none):/M50/rowlock-5.0
into debian.(none):/M51/rowlock-5.1
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 18477afb398..f53054da111 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,6 +20,7 @@ AUTOMAKE_OPTIONS = foreign # These are built from source in the Docs directory EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \ README COPYING EXCEPTIONS-CLIENT CMakeLists.txt + SUBDIRS = . include @docs_dirs@ @zlib_dir@ \ @readline_topdir@ sql-common scripts \ @thread_dirs@ pstack \ @@ -148,10 +149,6 @@ test-bt: -cd mysql-test ; MTR_BUILD_THREAD=auto \ @PERL@ ./mysql-test-run.pl --force --comment=stress --suite=stress -# Re-enable the "rowlock" suite when bug#28685 is fixed -# -cd mysql-test ; MTR_BUILD_THREAD=auto \ -# @PERL@ ./mysql-test-run.pl --force --comment=rowlock --suite=row_lock - # Re-enable the "jp" suite when bug#28563 is fixed # -cd mysql-test ; MTR_BUILD_THREAD=auto \ # @PERL@ ./mysql-test-run.pl --force --comment=jp --suite=jp |