diff options
| author | unknown <joerg@trift2.> | 2007-06-22 22:32:50 +0200 |
|---|---|---|
| committer | unknown <joerg@trift2.> | 2007-06-22 22:32:50 +0200 |
| commit | d77cd439acdf28a79395755f9e9458dbca535474 (patch) | |
| tree | b32971b338dd3022279e757b6d78ac5d589f89f7 | |
| parent | dbcba7cee6d17f4d82bc3048ed2aaa5171a59dca (diff) | |
| parent | 21905996518176047df3ff510ce1a7dd3fde6a3b (diff) | |
| download | mariadb-git-d77cd439acdf28a79395755f9e9458dbca535474.tar.gz | |
Merge trift2.:/MySQL/M50/push-5.0
into trift2.:/MySQL/M51/push-5.1
Makefile.am:
Manual merge.
| -rw-r--r-- | Makefile.am | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index 14f2886c472..88e0f949657 100644 --- a/Makefile.am +++ b/Makefile.am @@ -136,6 +136,14 @@ 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 + -if [ -d mysql-test/suite/nist ] ; then \ + cd mysql-test ; MTR_BUILD_THREAD=auto \ + @PERL@ ./mysql-test-run.pl --comment=NIST+normal --force --suite=nist ; \ + fi + -if [ -d mysql-test/suite/nist ] ; then \ + cd mysql-test ; MTR_BUILD_THREAD=auto \ + @PERL@ ./mysql-test-run.pl --comment=NIST+ps --force --suite=nist --ps-protocol ; \ + fi # Re-enable the "rowlock" suite when bug#28685 is fixed # -cd mysql-test ; MTR_BUILD_THREAD=auto \ |