diff options
| author | tsmith@quadxeon.mysql.com <> | 2007-06-15 01:57:33 +0200 |
|---|---|---|
| committer | tsmith@quadxeon.mysql.com <> | 2007-06-15 01:57:33 +0200 |
| commit | 918090030b5556f84a163719cf58d7f5bcdbc449 (patch) | |
| tree | 4e46aab8d2631db6cd28c72c3633307314281d7e /Makefile.am | |
| parent | 422d7999b5fa9cac2b92033fd0a0b177cd9327f5 (diff) | |
| parent | 5b221805864f78c4baf94d48efda842a84f9fa96 (diff) | |
| download | mariadb-git-918090030b5556f84a163719cf58d7f5bcdbc449.tar.gz | |
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun14/51
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index b92ee7ae0bc..14f2886c472 100644 --- a/Makefile.am +++ b/Makefile.am @@ -136,8 +136,10 @@ 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 "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 \ |