diff options
| author | unknown <joerg@debian.(none)> | 2007-07-26 18:40:46 +0200 |
|---|---|---|
| committer | unknown <joerg@debian.(none)> | 2007-07-26 18:40:46 +0200 |
| commit | 299fc364e2d7a9e7329c772daca5cc2e83829a03 (patch) | |
| tree | ef6c304d454994f96d022d77f8979dc9d130e533 /Makefile.am | |
| parent | ba559de4bed282d0f5adc31366001774e950a561 (diff) | |
| parent | d8c8c3437f0ee875f9738bb065d8d64a195af43a (diff) | |
| download | mariadb-git-299fc364e2d7a9e7329c772daca5cc2e83829a03.tar.gz | |
Merge debian.(none):/M50/rowlock-5.0
into debian.(none):/M51/rowlock-5.1
BitKeeper/deleted/.del-readme.txt~3:
Merge rename: BitKeeper/deleted/.del-readme.txt -> BitKeeper/deleted/.del-readme.txt~3
Makefile.am:
Manual merge: "row_lock" suite is deleted.
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 |