diff options
author | unknown <joerg@trift2.> | 2007-05-21 20:34:42 +0200 |
---|---|---|
committer | unknown <joerg@trift2.> | 2007-05-21 20:34:42 +0200 |
commit | 3f946fac39d0c4aee35c028d3b739d19e5e4c6d4 (patch) | |
tree | 2cbc8e71c11e9c1c872e7ea65d1d809bdbcc1660 /Makefile.am | |
parent | 2343b95f8b950a61315b6c52bd3c71295218e48b (diff) | |
parent | 25da4154ce3d90b6f31918208124f942f6baa3c4 (diff) | |
download | mariadb-git-3f946fac39d0c4aee35c028d3b739d19e5e4c6d4.tar.gz |
Merge trift2.:/MySQL/M51/mysql-5.1
into trift2.:/MySQL/M51/push-5.1
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 41ddf026a63..c69dd96f785 100644 --- a/Makefile.am +++ b/Makefile.am @@ -131,8 +131,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=jp --suite=jp + +# Re-enable the "jp" suite when bug#28563 is fixed +# -cd mysql-test ; MTR_BUILD_THREAD=auto \ +# @PERL@ ./mysql-test-run.pl --force --comment=jp --suite=jp test-bt-debug: -cd mysql-test ; MTR_BUILD_THREAD=auto \ |