diff options
| author | joerg@trift-lap.fambruehe <> | 2007-09-27 16:51:40 +0200 |
|---|---|---|
| committer | joerg@trift-lap.fambruehe <> | 2007-09-27 16:51:40 +0200 |
| commit | 6aa39a1cf6144bbcdc9c83046e94aaa9847e8cf7 (patch) | |
| tree | effe975a628e7eac9f000b15951630af53aba989 /Makefile.am | |
| parent | a02d8a5d06afe657756c26c88c7b7453caa45d5e (diff) | |
| parent | a81116eef859d886be9b0eb2128ce494ea462f6c (diff) | |
| download | mariadb-git-6aa39a1cf6144bbcdc9c83046e94aaa9847e8cf7.tar.gz | |
Merge trift-lap.fambruehe:/MySQL/M51/push-5.1
into trift-lap.fambruehe:/MySQL/M51/antony-5.1
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index b5b96fc5d06..a36d7b6c6f3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -153,8 +153,8 @@ test-bt: cd mysql-test ; MTR_BUILD_THREAD=auto \ @PERL@ ./mysql-test-run.pl --comment=NIST+ps --force --suite=nist --ps-protocol ; \ fi - -cd mysql-test ; MTR_BUILD_THREAD=auto \ - @PERL@ ./mysql-test-run.pl --force --comment=stress --suite=stress + -cd mysql-test ; MTR_BUILD_THREAD=auto \ + @PERL@ ./mysql-test-run.pl --force --comment=stress --suite=stress # Re-enable the "jp" suite when bug#28563 is fixed # -cd mysql-test ; MTR_BUILD_THREAD=auto \ |