diff options
| author | unknown <joerg@trift-lap.fambruehe> | 2007-09-27 16:51:40 +0200 |
|---|---|---|
| committer | unknown <joerg@trift-lap.fambruehe> | 2007-09-27 16:51:40 +0200 |
| commit | 5d6fac278472e26a5b0652b9b2056f3f275e3525 (patch) | |
| tree | effe975a628e7eac9f000b15951630af53aba989 /Makefile.am | |
| parent | 21628547b2d394785a92d38c664855f779eb57fe (diff) | |
| parent | 1f1975681ba455b02380ea464fe232d9f641989a (diff) | |
| download | mariadb-git-5d6fac278472e26a5b0652b9b2056f3f275e3525.tar.gz | |
Merge trift-lap.fambruehe:/MySQL/M51/push-5.1
into trift-lap.fambruehe:/MySQL/M51/antony-5.1
Makefile.am:
Auto merged
configure.in:
Auto merged
storage/innobase/handler/ha_innodb.cc:
Auto merged
mysql-test/suite/funcs_1/r/innodb__datadict.result:
Use most current version of test results.
mysql-test/suite/funcs_1/r/memory__datadict.result:
Use most current version of test results.
mysql-test/suite/funcs_1/r/myisam__datadict.result:
Use most current version of test results.
mysql-test/suite/funcs_1/r/ndb__datadict.result:
Use most current version of test results.
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 \ |