diff options
| author | unknown <joerg@trift2.> | 2007-05-22 17:51:51 +0200 |
|---|---|---|
| committer | unknown <joerg@trift2.> | 2007-05-22 17:51:51 +0200 |
| commit | cd0fcf34a700d4e87a561edb6ae4ff0b1d4a4203 (patch) | |
| tree | cf6ef42cacb77f4035c1531f1487aacf9e8c4c10 /Makefile.am | |
| parent | 3f946fac39d0c4aee35c028d3b739d19e5e4c6d4 (diff) | |
| parent | 08639fb9e799999a3522019c81062914050af7cd (diff) | |
| download | mariadb-git-cd0fcf34a700d4e87a561edb6ae4ff0b1d4a4203.tar.gz | |
Merge trift2.:/MySQL/M50/bug26609-5.0
into trift2.:/MySQL/M51/bug26609-5.1
Makefile.am:
Manual merge: Include the "row_lock" suite in the "test-bt" target.
scripts/make_binary_distribution.sh:
Manual merge: Include the additional test suites in the binary package.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index c69dd96f785..69ea5809e89 100644 --- a/Makefile.am +++ b/Makefile.am @@ -131,6 +131,8 @@ test-bt: @PERL@ ./mysql-test-run.pl --force --comment=rpl --suite=rpl -cd mysql-test ; MTR_BUILD_THREAD=auto \ @PERL@ ./mysql-test-run.pl --force --comment=partitions --suite=parts + -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 \ |